mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,197 Commits 2 Branches 9 Tags
a41a628385ae77b29ec2b50abd9c0d41bbd16d6c
Commit Graph

12197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vanhofen
b15f91ff97 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 79162ebf6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-30 (Wed, 30 Aug 2017)
 2017-08-30 18:12:10 +02:00
vanhofen
73c370ab33 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
------------------
Commit: fd25630d53
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-30 (Wed, 30 Aug 2017)
 2017-08-30 18:11:59 +02:00
Jacek Jendrzej
5d1ed28722 pic max10<max_10@gmx.de> code from commit f480ad018c72d40a9d2d2fb4006cfca1c262234d 
Origin commit data
------------------
Commit: 2d4f52ae62
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-29 (Tue, 29 Aug 2017)
 2017-08-29 16:35:32 +02:00
Jacek Jendrzej
d418a549da Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 4700523643
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-29 (Tue, 29 Aug 2017)
 2017-08-29 16:33:21 +02:00
gixxpunk
2a90401c0f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 704c3f25f9
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-08-29 (Tue, 29 Aug 2017)
 2017-08-29 15:59:53 +02:00
Jacek Jendrzej
651099e559 remove my stupid init 
Origin commit data
------------------
Commit: c5dc1b7770
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-29 (Tue, 29 Aug 2017)
 2017-08-29 15:01:31 +02:00
vanhofen
a39aa78a4c locale: small changes in update locales 
Origin commit data
------------------
Commit: f1393b5bd5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-29 (Tue, 29 Aug 2017)

Origin message was:
------------------
- locale: small changes in update locales
 2017-08-29 14:38:26 +02:00
Jacek Jendrzej
a23840bc0c Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 23797d29c0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-29 (Tue, 29 Aug 2017)
 2017-08-29 11:26:54 +02:00
vanhofen
42d68f122c capmt: reduce console-spam, remove additional linefeeds from INFO-lines 
Origin commit data
------------------
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
 2017-08-28 14:04:00 +02:00
vanhofen
3ad81e8d39 Revert "CTimerList: adjust label width in footer dependent by count of buttons" 
This reverts commit d8caaaf758.


Origin commit data
------------------
Commit: 3dbbd378f0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
 2017-08-28 13:18:35 +02:00
vanhofen
64edcce085 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a32d348e32
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
 2017-08-28 12:40:40 +02:00
Thilo Graf
d8caaaf758 CTimerList: adjust label width in footer dependent by count of buttons 
Origin commit data
------------------
Commit: 3987c3a306
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
 2017-08-28 12:16:45 +02:00
Thilo Graf
f36f3d25e6 CTimerList: paint header only if required 
Avoid possible flicker effects.

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


Origin commit data
------------------
Commit: 4dd12767f9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
 2017-08-28 12:16:45 +02:00
Thilo Graf
ab4bcc584a comments: fix copy paste errors 
Origin commit data
------------------
Commit: 6e310a8157
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
 2017-08-28 12:16:45 +02:00
Thilo Graf
b490817d1b cc_item_shapes.cpp/h: Add method to create draw boxes without explicit objects 
Origin commit data
------------------
Commit: c743cb632b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
 2017-08-28 12:16:45 +02:00
Thilo Graf
6112dbafcb Helpbox: add missing check for null pointer 
Origin commit data
------------------
Commit: b5d33f10e1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
 2017-08-28 12:16:45 +02:00
Thilo Graf
7991e183c5 CComponentsHeader: add missing check for null pointer 
Origin commit data
------------------
Commit: 5221769840
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
 2017-08-28 12:16:45 +02:00
Thilo Graf
6b4e74972b CProgressBarCache: remove benchmark lines 
Was only for debugging.


Origin commit data
------------------
Commit: d42389b167
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
 2017-08-28 12:16:45 +02:00
Thilo Graf
4f19bd2aba CComponentsPicture: remove benchmark lines 
Was only for debugging.


Origin commit data
------------------
Commit: f07a27825d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
 2017-08-28 12:16:45 +02:00
Thilo Graf
4b4e48ecf3 CComponentsFooter: fix possible error with non-POD element type 
affected is struct type 'button_label_cc'


Origin commit data
------------------
Commit: 16dac64ed2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
 2017-08-28 12:16:45 +02:00
Thilo Graf
2e4b222438 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
------------------
Commit: 27995b19fa
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
 2017-08-28 12:16:45 +02:00
Thilo Graf
fbb0fc68b0 cc_frm.cpp, cc_frm_button.cpp: remove unread stored variables 
Origin commit data
------------------
Commit: fe6a24351b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
 2017-08-28 12:16:45 +02:00
Thilo Graf
4e5f95d391 CComponentsFrmClock: fix wrong initialization of w_tmp 
Origin commit data
------------------
Commit: 758081a0ac
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-28 (Mon, 28 Aug 2017)
 2017-08-28 12:16:45 +02:00
vanhofen
284426853d Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: ff282cbad1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)
 2017-08-27 23:56:52 +02:00
vanhofen
55f23341f2 Revert "epgplus: restore old KEY_epg behaviour" 
This reverts commit 77f71f0ce4.


Origin commit data
------------------
Commit: ec105df737
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)
 2017-08-27 23:56:32 +02:00
vanhofen
8d6a5b449d Revert "epgplus: restore white grid lines instead of invisible dark ones" 
This reverts commit 7ff442ac08.


Origin commit data
------------------
Commit: c709184e31
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)
 2017-08-27 23:56:17 +02:00
vanhofen
25a4911df4 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
------------------
Commit: a4fd09ecc2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)
 2017-08-27 23:55:53 +02:00
Stefan Seyfried
7ff442ac08 epgplus: restore white grid lines instead of invisible dark ones 
Origin commit data
------------------
Commit: 1df104ecc9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-26 (Sat, 26 Aug 2017)
 2017-08-26 13:10:12 +02:00
Stefan Seyfried
77f71f0ce4 epgplus: restore old KEY_epg behaviour 
Origin commit data
------------------
Commit: 5944db95dd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-26 (Sat, 26 Aug 2017)
 2017-08-26 13:09:32 +02:00
Stefan Seyfried
5db1afe258 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: d1f5ea76a0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-26 (Sat, 26 Aug 2017)
 2017-08-26 12:58:44 +02:00
gixxpunk
78143c569a re-add missing include 
Origin commit data
------------------
Commit: 940569fb9e
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-08-26 (Sat, 26 Aug 2017)

Origin message was:
------------------
- re-add missing include
 2017-08-26 12:38:16 +02:00
vanhofen
e87210b1d2 remove possibility to change iconsets for infoviewer 
Origin commit data
------------------
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
 2017-08-26 10:19:37 +02:00
vanhofen
7330a4cd9d Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: ceb6a44db6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)
 2017-08-25 14:48:07 +02:00
Stefan Seyfried
8866526463 rcinput: fix getKeyName for RC_none case 
Origin commit data
------------------
Commit: eaec2224e1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)
 2017-08-25 14:46:25 +02:00
Stefan Seyfried
b5fb6015dc CKeyChooserItemNoKey: fix type cast 
Origin commit data
------------------
Commit: 7863853678
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)
 2017-08-25 14:46:06 +02:00
Stefan Seyfried
890d85cc1e 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
------------------
Commit: 7c5bb95597
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-19 (Sat, 19 Aug 2017)
 2017-08-25 14:45:43 +02:00
vanhofen
96e6ac6462 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
------------------
Commit: bb00f9f2e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)
 2017-08-25 14:29:45 +02:00
vanhofen
7c75ab360f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 3c35e98212
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)
 2017-08-25 14:15:22 +02:00
vanhofen
7c35266afe Merge branch 'ni/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/tuxbox 
Origin commit data
------------------
Commit: e6ba09c94c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-23 (Wed, 23 Aug 2017)
 2017-08-23 15:24:48 +02:00
vanhofen
5628badb78 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 470a8b62dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-23 (Wed, 23 Aug 2017)
 2017-08-23 15:24:38 +02:00
Jacek Jendrzej
c066cf6bf2 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 6be63f736c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)
 2017-08-23 13:10:49 +02:00
Jacek Jendrzej
142d17c8b0 fix possible out of bound memory access 
Origin commit data
------------------
Commit: 350a73ce08
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)
 2017-08-23 13:05:57 +02:00
Jacek Jendrzej
1e1d5ed137 null pointer check 
Origin commit data
------------------
Commit: 527c0de33a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)
 2017-08-23 13:03:34 +02:00
Jacek Jendrzej
d1c3f8a157 fxi possible buffer overflow 
Origin commit data
------------------
Commit: e58e72635b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)
 2017-08-23 13:00:24 +02:00
Jacek Jendrzej
96edd2f2c1 some inits and never read var 
Origin commit data
------------------
Commit: ba600f0e5c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)
 2017-08-23 12:58:26 +02:00
gixxpunk
71f4b365a2 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: c68222408f
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)
 2017-08-21 21:25:30 +02:00
Jacek Jendrzej
973b9ebe54 some inits warnings 
Origin commit data
------------------
Commit: c99486520e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)
 2017-08-21 14:42:24 +02:00
gixxpunk
94d3c4815b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: f2446caf3b
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)
 2017-08-21 14:16:12 +02:00
Jacek Jendrzej
a887d8b2e9 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 8c45b2eea6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)
 2017-08-21 13:13:03 +02:00
vanhofen
cce5365b59 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
------------------
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
 2017-08-21 12:56:00 +02:00