Commit Graph

13430 Commits

Author SHA1 Message Date
Thilo Graf
bf5722ee3a CProgressBarCache: remove benchmark lines
Was only for debugging.


Origin commit data
------------------
Branch: ni/coolstream
Commit: d42389b167
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)



------------------
This commit was generated by Migit
2017-08-28 12:16:45 +02:00
Thilo Graf
4c6d63035e CComponentsPicture: remove benchmark lines
Was only for debugging.


Origin commit data
------------------
Branch: ni/coolstream
Commit: f07a27825d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)



------------------
This commit was generated by Migit
2017-08-28 12:16:45 +02:00
Thilo Graf
08cb699175 CComponentsFooter: fix possible error with non-POD element type
affected is struct type 'button_label_cc'


Origin commit data
------------------
Branch: ni/coolstream
Commit: 16dac64ed2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)



------------------
This commit was generated by Migit
2017-08-28 12:16:45 +02:00
Thilo Graf
ce38d56273 CComponentsFooter: fix possible conversion warning
For platform compatibility. eg. with neutrino-pc on it is possible
that size_t is long unsigned ini, for others unsinged int


Origin commit data
------------------
Branch: ni/coolstream
Commit: 27995b19fa
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)



------------------
This commit was generated by Migit
2017-08-28 12:16:45 +02:00
Thilo Graf
08eb91b084 cc_frm.cpp, cc_frm_button.cpp: remove unread stored variables
Origin commit data
------------------
Branch: ni/coolstream
Commit: fe6a24351b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-28 12:16:45 +02:00
Thilo Graf
9569be0ff1 CComponentsFrmClock: fix wrong initialization of w_tmp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 758081a0ac
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-28 12:16:45 +02:00
vanhofen
4b44169b39 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff282cbad1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-27 23:56:52 +02:00
vanhofen
ee06650293 Revert "epgplus: restore old KEY_epg behaviour"
This reverts commit 98f170aec2.


Origin commit data
------------------
Branch: ni/coolstream
Commit: ec105df737
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)



------------------
This commit was generated by Migit
2017-08-27 23:56:32 +02:00
vanhofen
68f4dbc9f0 Revert "epgplus: restore white grid lines instead of invisible dark ones"
This reverts commit 540d4830e0.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c709184e31
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)



------------------
This commit was generated by Migit
2017-08-27 23:56:17 +02:00
vanhofen
31716245ba Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	src/driver/screenshot.cpp
	src/driver/streamts.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a4fd09ecc2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)



------------------
This commit was generated by Migit
2017-08-27 23:55:53 +02:00
Stefan Seyfried
540d4830e0 epgplus: restore white grid lines instead of invisible dark ones
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1df104ecc9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-26 (Sat, 26 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-26 13:10:12 +02:00
Stefan Seyfried
98f170aec2 epgplus: restore old KEY_epg behaviour
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5944db95dd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-26 (Sat, 26 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-26 13:09:32 +02:00
Stefan Seyfried
f889b88c73 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: d1f5ea76a0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-26 (Sat, 26 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-26 12:58:44 +02:00
gixxpunk
3287a5ded5 re-add missing include
Origin commit data
------------------
Branch: ni/coolstream
Commit: 940569fb9e
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-08-26 (Sat, 26 Aug 2017)

Origin message was:
------------------
- re-add missing include

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-26 12:38:16 +02:00
vanhofen
7ec5908e8e remove possibility to change iconsets for infoviewer
Origin commit data
------------------
Branch: ni/coolstream
Commit: ae9435f75d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-26 (Sat, 26 Aug 2017)

Origin message was:
------------------
- remove possibility to change iconsets for infoviewer

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-26 10:19:37 +02:00
vanhofen
d327159f96 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ceb6a44db6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-25 14:48:07 +02:00
Stefan Seyfried
b6b774046d rcinput: fix getKeyName for RC_none case
Origin commit data
------------------
Branch: ni/coolstream
Commit: eaec2224e1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-25 14:46:25 +02:00
Stefan Seyfried
52a42f2459 CKeyChooserItemNoKey: fix type cast
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7863853678
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-25 14:46:06 +02:00
Stefan Seyfried
6055e3f088 fb_accel_sti: reorder blit_mutex locking
This seems to help spurious deadlocks in the STI framebuffer blit code.
Not 100% sure why, butthis helps, but I have not seen lockups with this.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c5bb95597
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-19 (Sat, 19 Aug 2017)



------------------
This commit was generated by Migit
2017-08-25 14:45:43 +02:00
vanhofen
dbdda1de51 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	acinclude.m4
	lib/hardware/coolstream/hardware_caps.cpp
	src/Makefile.am
	src/driver/screenshot.cpp
	src/gui/epgplus.cpp
	src/gui/scan_setup.cpp
	src/neutrino.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: bb00f9f2e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)



------------------
This commit was generated by Migit
2017-08-25 14:29:45 +02:00
vanhofen
4198cb9a35 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c35e98212
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)



------------------
This commit was generated by Migit
2017-08-25 14:15:22 +02:00
vanhofen
84b01945fb Merge branch 'ni/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e6ba09c94c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-23 (Wed, 23 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-23 15:24:48 +02:00
vanhofen
79c24b3173 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 470a8b62dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-23 (Wed, 23 Aug 2017)



------------------
This commit was generated by Migit
2017-08-23 15:24:38 +02:00
Jacek Jendrzej
e36f298e5d Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6be63f736c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-23 13:10:49 +02:00
Jacek Jendrzej
6b015862c1 fix possible out of bound memory access
Origin commit data
------------------
Branch: ni/coolstream
Commit: 350a73ce08
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-23 13:05:57 +02:00
Jacek Jendrzej
d4247c0036 null pointer check
Origin commit data
------------------
Branch: ni/coolstream
Commit: 527c0de33a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-23 13:03:34 +02:00
Jacek Jendrzej
7b57171e46 fxi possible buffer overflow
Origin commit data
------------------
Branch: ni/coolstream
Commit: e58e72635b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-23 13:00:24 +02:00
Jacek Jendrzej
d7856dc0ce some inits and never read var
Origin commit data
------------------
Branch: ni/coolstream
Commit: ba600f0e5c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-23 12:58:26 +02:00
gixxpunk
147aab409a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: c68222408f
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-21 21:25:30 +02:00
Jacek Jendrzej
c592fe60d6 some inits warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: c99486520e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-21 14:42:24 +02:00
gixxpunk
d31c0df3f3 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: f2446caf3b
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-21 14:16:12 +02:00
Jacek Jendrzej
640171523a Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c45b2eea6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-21 13:13:03 +02:00
vanhofen
cb19741014 hw_caps: remove CFEManager-code; ...
the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start


Origin commit data
------------------
Branch: ni/coolstream
Commit: c307ed5b36
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-14 (Mon, 14 Aug 2017)

Origin message was:
------------------
- hw_caps: remove CFEManager-code; ...

the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start


------------------
This commit was generated by Migit
2017-08-21 12:56:00 +02:00
Jacek Jendrzej
254893c889 Revert "- neutrino: fix hw_caps init; it must be initialized after zapit start"
This reverts commit 4ded8abb12.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c8ae9595c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)



------------------
This commit was generated by Migit
2017-08-21 12:53:05 +02:00
Jacek Jendrzej
1f09810ff1 part from ceab6aafbb
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0238049daf
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-21 10:57:18 +02:00
Stefan Seyfried
fe7c56581b Revert "- hardware_caps: fix has_fan and add detection of Neo Twin"
This reverts commit 2770d07bea.
This leads to a segfault at start and the upstream solution
is not yet ready for primetime, so revert this for now.


Origin commit data
------------------
Branch: ni/coolstream
Commit: e2db590797
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)



------------------
This commit was generated by Migit
2017-08-21 10:17:05 +02:00
Stefan Seyfried
ff37fec9a8 rcinput: add two more keys in the ugly azbox translate() table
Origin commit data
------------------
Branch: ni/coolstream
Commit: d0a21abd9f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-21 10:17:05 +02:00
Stefan Seyfried
e2f6639bbb zapit: trivial azbox compile fix
Origin commit data
------------------
Branch: ni/coolstream
Commit: fd4a3516e5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-21 10:17:05 +02:00
Stefan Seyfried
559fd22ab2 rcinput: fix getKeyName for RC_none case
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4978ed7675
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-21 10:17:05 +02:00
Stefan Seyfried
97c92523bc CKeyChooserItemNoKey: fix type cast
Origin commit data
------------------
Branch: ni/coolstream
Commit: a1a5965017
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-21 10:17:05 +02:00
Stefan Seyfried
069ea0b8d4 fb_accel_sti: reorder blit_mutex locking
This seems to help spurious deadlocks in the STI framebuffer blit code.
Not 100% sure why, butthis helps, but I have not seen lockups with this.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 223d1d709f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-19 (Sat, 19 Aug 2017)



------------------
This commit was generated by Migit
2017-08-21 10:17:05 +02:00
Stefan Seyfried
8ad638b6b0 coolstream: disable uncoolinit build
it does not build right now for undefined fb_pixel_t, and it is unused
anyway after a workaround in zapit code has been introduced


Origin commit data
------------------
Branch: ni/coolstream
Commit: ee031801e4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)



------------------
This commit was generated by Migit
2017-08-21 10:17:05 +02:00
Jacek Jendrzej
3e3a327ac7 Revert "- neutrino: fix hw_caps init; it must be initialized after zapit start"
This reverts commit 4ded8abb12.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 491e51beeb
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)



------------------
This commit was generated by Migit
2017-08-21 10:03:52 +02:00
Stefan Seyfried
ec932813a0 Revert "- hardware_caps: fix has_fan and add detection of Neo Twin"
This reverts commit 2770d07bea.
This leads to a segfault at start and the upstream solution
is not yet ready for primetime, so revert this for now.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 009838b977
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)



------------------
This commit was generated by Migit
2017-08-20 16:19:57 +02:00
Stefan Seyfried
e11dd6323d rcinput: add two more keys in the ugly azbox translate() table
Origin commit data
------------------
Branch: ni/coolstream
Commit: f8ca80e0ca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-20 11:52:04 +02:00
Stefan Seyfried
ff293617d9 zapit: trivial azbox compile fix
Origin commit data
------------------
Branch: ni/coolstream
Commit: 30a7d083c5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-20 11:44:57 +02:00
Stefan Seyfried
a2decedbd8 rcinput: fix getKeyName for RC_none case
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6ca45cb5fa
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-20 11:44:01 +02:00
Stefan Seyfried
fec7979dfa CKeyChooserItemNoKey: fix type cast
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d02b3213f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-20 11:30:57 +02:00
Stefan Seyfried
659f5c8552 fb_accel_sti: reorder blit_mutex locking
This seems to help spurious deadlocks in the STI framebuffer blit code.
Not 100% sure why, butthis helps, but I have not seen lockups with this.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 56c24f4031
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-19 (Sat, 19 Aug 2017)



------------------
This commit was generated by Migit
2017-08-19 21:43:54 +02:00
vanhofen
90a51a4564 audioplayer: update gui if streamripper has stopped or crashed
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a5843ca02
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-18 (Fri, 18 Aug 2017)

Origin message was:
------------------
- audioplayer: update gui if streamripper has stopped or crashed

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-08-18 13:16:40 +02:00