Commit Graph

12749 Commits

Author SHA1 Message Date
vanhofen
72d164d89d add webtv-scripts/sources to neutrino-repo; will be auto-loaded at start
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a1aeb3038
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-31 (Thu, 31 Aug 2017)

Origin message was:
------------------
- add webtv-scripts/sources to neutrino-repo; will be auto-loaded at start

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

------------------
This commit was generated by Migit
2017-08-31 08:59:06 +02:00
vanhofen
0ed34a4ba9 acinclude.m4: add missing variables substitutions
Origin commit data
------------------
Branch: ni/coolstream
Commit: af9f09e8c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-31 (Thu, 31 Aug 2017)

Origin message was:
------------------
- acinclude.m4: add missing variables substitutions

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

------------------
This commit was generated by Migit
2017-08-31 08:57:47 +02:00
vanhofen
bffe012707 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 79162ebf6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-30 (Wed, 30 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-30 18:12:10 +02:00
vanhofen
fec86c7ee5 Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	src/gui/components/cc_frm_footer.cpp
	src/neutrino.cpp


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



------------------
This commit was generated by Migit
2017-08-30 18:11:59 +02:00
Jacek Jendrzej
44a8e0b0b4 pic max10<max_10@gmx.de> code from commit f480ad018c72d40a9d2d2fb4006cfca1c262234d
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2d4f52ae62
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-29 (Tue, 29 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-29 16:35:32 +02:00
Jacek Jendrzej
f2789ab85e Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4700523643
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-29 (Tue, 29 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-29 16:33:21 +02:00
gixxpunk
104347e12c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 704c3f25f9
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-08-29 (Tue, 29 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-29 15:59:53 +02:00
Jacek Jendrzej
e7b9f353e2 remove my stupid init
Origin commit data
------------------
Branch: ni/coolstream
Commit: c5dc1b7770
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-29 (Tue, 29 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-29 15:01:31 +02:00
vanhofen
d7f0d1b26a locale: small changes in update locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: f1393b5bd5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-29 (Tue, 29 Aug 2017)

Origin message was:
------------------
- locale: small changes in update locales

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

------------------
This commit was generated by Migit
2017-08-29 14:38:26 +02:00
Jacek Jendrzej
6719ebaba1 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 23797d29c0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-29 (Tue, 29 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-29 11:26:54 +02:00
vanhofen
6556b437c0 capmt: reduce console-spam, remove additional linefeeds from INFO-lines
Origin commit data
------------------
Branch: ni/coolstream
Commit: 108476a8b2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)

Origin message was:
------------------
- capmt: reduce console-spam, remove additional linefeeds from INFO-lines

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

------------------
This commit was generated by Migit
2017-08-28 14:04:00 +02:00
vanhofen
76b23bcf9f Revert "CTimerList: adjust label width in footer dependent by count of buttons"
This reverts commit ec598a94b5.


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



------------------
This commit was generated by Migit
2017-08-28 13:18:35 +02:00
vanhofen
087e90e83f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a32d348e32
Author: vanhofen <vanhofen@gmx.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:40:40 +02:00
Thilo Graf
ec598a94b5 CTimerList: adjust label width in footer dependent by count of buttons
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3987c3a306
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
4249ab0497 CTimerList: paint header only if required
Avoid possible flicker effects.

TODO: fix clock background with enabled gradient on header repaint.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4dd12767f9
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
ba35604b8d comments: fix copy paste errors
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e310a8157
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
e85ba36b43 cc_item_shapes.cpp/h: Add method to create draw boxes without explicit objects
Origin commit data
------------------
Branch: ni/coolstream
Commit: c743cb632b
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
31a3bb2ae0 Helpbox: add missing check for null pointer
Origin commit data
------------------
Branch: ni/coolstream
Commit: b5d33f10e1
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
66876b7889 CComponentsHeader: add missing check for null pointer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5221769840
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
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