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

12551 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vanhofen
273bb22242 movieplayer: rename isWebTV => isWebChannel 
Origin commit data
------------------
Commit: ee8627a842
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- movieplayer: rename isWebTV => isWebChannel
 2017-11-03 09:36:20 +01:00
vanhofen
b5448a9e90 rename LIST_MODE_WEBTV => LIST_MODE_WEB 
Origin commit data
------------------
Commit: cd5577e8b5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename LIST_MODE_WEBTV => LIST_MODE_WEB
 2017-11-03 09:36:19 +01:00
vanhofen
4f82f61191 scanepg: rename webtv => webchan 
Origin commit data
------------------
Commit: b86a3a1a7a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- scanepg: rename webtv => webchan
 2017-11-03 09:36:19 +01:00
vanhofen
268e94d9e3 rename IS_WEBTV => IS_WEBCHAN 
Origin commit data
------------------
Commit: ebcd15da41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename IS_WEBTV => IS_WEBCHAN
 2017-11-03 09:36:19 +01:00
vanhofen
560914abb0 movieplayer: fix new mode 
Origin commit data
------------------
Commit: 1a304cede1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- movieplayer: fix new mode
 2017-11-03 09:36:19 +01:00
vanhofen
73764d9de0 fix mode in SetChannelMode() 
Origin commit data
------------------
Commit: 4ad5798e48
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix mode in SetChannelMode()
 2017-11-03 09:36:19 +01:00
vanhofen
cfe55074b3 fix -Wlogical-op errors 
Origin commit data
------------------
Commit: fe487f3976
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix -Wlogical-op errors
 2017-11-03 09:36:19 +01:00
vanhofen
560bcc7221 add webradio; first steps 
Origin commit data
------------------
Commit: a8b0fee599
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- add webradio; first steps
 2017-11-03 09:36:19 +01:00
vanhofen
f061d0973e fix another merge error vol.2 
Origin commit data
------------------
Commit: ee3599ea6a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix another merge error vol.2
 2017-11-03 08:48:54 +01:00
vanhofen
dbc81968f9 fix another merge error 
Origin commit data
------------------
Commit: 59a9cc5dff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix another merge error
 2017-11-03 08:45:06 +01:00
vanhofen
fbfecb936d Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: a26e30482e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 00:10:56 +01:00
vanhofen
28413bca7c fix last merge #2 
Origin commit data
------------------
Commit: c1cea39c1d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix last merge #2
 2017-11-03 00:10:32 +01:00
vanhofen
d99f701c0b Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	acinclude.m4
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/lcdd.h
	src/driver/rcinput.cpp
	src/driver/rcinput.h
	src/driver/screenshot.cpp
	src/driver/screenshot.h
	src/driver/simple_display.cpp
	src/driver/vfd.cpp
	src/gui/audio_select.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/movieplayer.h
	src/zapit/include/zapit/capmt.h
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 1fa735aa45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 00:09:05 +01:00
vanhofen
bb04aa225e fix last merge 
Origin commit data
------------------
Commit: be97dd6bb1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)

Origin message was:
------------------
- fix last merge
 2017-11-02 23:48:38 +01:00
vanhofen
6bda6dbce7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	acinclude.m4
	configure.ac
	data/fonts/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	data/webtv/Makefile.am
	data/y-web/Y_Tools_Boxcontrol.yhtm
	data/y-web/Y_Tools_Screenshot.yhtm
	lib/hardware/coolstream/hardware_caps.h
	lib/libtuxtxt/tuxtxt_common.h
	src/gui/audioplayer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/movieplayer.h
	src/gui/network_setup.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: ae4307bc1c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)
 2017-11-02 23:25:41 +01:00
Thilo Graf
dbe8dcc351 update version to 3.6.1 
start up AX/Mut@nt hd51 support


Origin commit data
------------------
Commit: 83655f78d6
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)
 2017-11-02 21:49:25 +01:00
GetAway
d2896d02c2 menue.cpp: dont use one-time init of a variable that could be changed on runtime 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 7c9bf1df92
Author: GetAway <get-away@t-online.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)
 2017-11-02 21:31:12 +01:00
vanhofen
137d4c36a9 rename can_set_display_brightness => display_can_set_brightness 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 91fdb1ef6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- rename can_set_display_brightness => display_can_set_brightness

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-02 21:23:01 +01:00
vanhofen
868d95cea9 vfd-setup: use new display_can_deepstandby member from libstb-hal 
Signed-off-by: Thilo Graf <dbt@novatux.de>

Build was broken with original cherry-pick. hw_caps_t was incomplete.


Origin commit data
------------------
Commit: 674ba19c03
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- vfd-setup: use new display_can_deepstandby member from libstb-hal

Signed-off-by: Thilo Graf <dbt@novatux.de>

Build was broken with original cherry-pick. hw_caps_t was incomplete.
 2017-11-02 21:22:01 +01:00
vanhofen
aa0e257316 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 4d43af73f3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)
 2017-11-02 13:26:06 +01:00
GetAway
548eaef43f menue.cpp: dont use one-time init of a variable that could be changed on runtime 
Origin commit data
------------------
Commit: c1ce74f776
Author: GetAway <get-away@t-online.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)
 2017-11-02 13:25:47 +01:00
vanhofen
03c952f742 simple_display: fix c/p error 
Origin commit data
------------------
Commit: b76c213815
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)

Origin message was:
------------------
- simple_display: fix c/p error
 2017-11-02 11:18:01 +01:00
vanhofen
ae3ec8850d simple_display: fix some compiler warnings 
Origin commit data
------------------
Commit: 10592800ec
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- simple_display: fix some compiler warnings
 2017-11-01 15:49:47 +01:00
vanhofen
374a711049 simple_display: more readability in togglePower() function 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 0fac12001e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- simple_display: more readability in togglePower() function

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-01 15:44:07 +01:00
vanhofen
a1d88ba3b8 simple_display: fix showRCLock() function 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: dbce194f82
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- simple_display: fix showRCLock() function

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-01 15:43:43 +01:00
vanhofen
35a31bbff1 epgview: disable epgid debug code 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 61a31e2609
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- epgview: disable epgid debug code

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-01 15:42:05 +01:00
vanhofen
07862f81ac simple_display: fix text while rc is locked 
Origin commit data
------------------
Commit: 14861ec924
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- simple_display: fix text while rc is locked
 2017-11-01 15:41:34 +01:00
TangoCash
d1054e7875 movieplayer: add progress to vfd 
Origin commit data
------------------
Commit: ad757a9a60
Author: TangoCash <eric@loxat.de>
Date: 2017-10-31 (Tue, 31 Oct 2017)

Origin message was:
------------------
- movieplayer: add progress to vfd
 2017-11-01 15:40:28 +01:00
vanhofen
873d09ff78 introduce simple_display.h; just a cleaned copy of lcdd.h 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 422a9b41de
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-31 (Tue, 31 Oct 2017)

Origin message was:
------------------
- introduce simple_display.h; just a cleaned copy of lcdd.h

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-01 15:39:07 +01:00
gixxpunk
fbb89b39dc CMovieBrowser::info_hdd_level(): fix miscalculation 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 0b3f91a4c1
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-30 (Mon, 30 Oct 2017)

Origin message was:
------------------
- CMovieBrowser::info_hdd_level(): fix miscalculation

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-11-01 15:37:21 +01:00
vanhofen
e629487bbb rename can_set_display_brightness => display_can_set_brightness 
Origin commit data
------------------
Commit: 8a6c8ee06d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- rename can_set_display_brightness => display_can_set_brightness
 2017-11-01 15:19:35 +01:00
vanhofen
d1cf8082f5 vfd-setup: use new display_can_deepstandby member from libstb-hal 
Origin commit data
------------------
Commit: d1eadb0830
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- vfd-setup: use new display_can_deepstandby member from libstb-hal
 2017-11-01 15:19:31 +01:00
vanhofen
06b0dcf1d3 rename can_set_display_brightness => display_can_set_brightness 
Origin commit data
------------------
Commit: 157fabea51
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- rename can_set_display_brightness => display_can_set_brightness
 2017-11-01 15:17:52 +01:00
vanhofen
985b7e6866 vfd-setup: use new display_can_deepstandby member from libstb-hal 
Origin commit data
------------------
Commit: 491ca15848
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- vfd-setup: use new display_can_deepstandby member from libstb-hal
 2017-11-01 15:10:38 +01:00
vanhofen
8a47214eb3 simple_display: more readability in togglePower() function 
Origin commit data
------------------
Commit: 53f1790261
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- simple_display: more readability in togglePower() function
 2017-11-01 13:00:33 +01:00
vanhofen
72cdbabb5d simple_display: fix showRCLock() function 
Origin commit data
------------------
Commit: c8250b027c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- simple_display: fix showRCLock() function
 2017-11-01 12:56:41 +01:00
vanhofen
1f540035b5 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: db0264d497
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)
 2017-11-01 12:23:10 +01:00
vanhofen
0f2484d001 epgview: disable epgid debug code 
Origin commit data
------------------
Commit: 98fa2e2722
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- epgview: disable epgid debug code
 2017-11-01 12:21:16 +01:00
TangoCash
a75d6bb3bd fix hevc record 
Origin commit data
------------------
Commit: b9c2aaf3af
Author: TangoCash <eric@loxat.de>
Date: 2017-10-31 (Tue, 31 Oct 2017)
 2017-11-01 08:38:33 +01:00
TangoCash
cc63e6b81a fix hevc record 
Origin commit data
------------------
Commit: 676586af26
Author: TangoCash <eric@loxat.de>
Date: 2017-10-31 (Tue, 31 Oct 2017)
 2017-10-31 23:35:01 +01:00
TangoCash
bbf308232b movieplayer: add progress to vfd 
Origin commit data
------------------
Commit: fbbf396d13
Author: TangoCash <eric@loxat.de>
Date: 2017-10-31 (Tue, 31 Oct 2017)

Origin message was:
------------------
- movieplayer: add progress to vfd
 2017-10-31 23:35:01 +01:00
vanhofen
2ebd585c3f introduce simple_display.h; just a cleaned copy of lcdd.h 
Origin commit data
------------------
Commit: 19f573d074
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-31 (Tue, 31 Oct 2017)

Origin message was:
------------------
- introduce simple_display.h; just a cleaned copy of lcdd.h
 2017-10-31 23:35:01 +01:00
TangoCash
f99a088a86 add support for H265 
Origin commit data
------------------
Commit: 29221aaca5
Author: TangoCash <eric@loxat.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)
 2017-10-31 10:15:55 +01:00
gixxpunk
f5696842d6 Merge branch 'ni/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 889a8f39b4
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-30 (Mon, 30 Oct 2017)
 2017-10-30 21:08:51 +01:00
gixxpunk
81b39f2745 CMovieBrowser::info_hdd_level(): fix miscalculation 
Origin commit data
------------------
Commit: a75915414d
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-30 (Mon, 30 Oct 2017)

Origin message was:
------------------
- CMovieBrowser::info_hdd_level(): fix miscalculation
 2017-10-30 21:01:52 +01:00
vanhofen
7481d60fd1 acinclude: move default PUBLIC_HTTPDDIR from /var/httpd to /var/tuxbox/httpd 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: e1349234f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)

Origin message was:
------------------
- acinclude: move default PUBLIC_HTTPDDIR from /var/httpd to /var/tuxbox/httpd

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-10-30 17:34:05 +01:00
vanhofen
574604eb2c audioplayer: allow RC_previoussong and RC_nextsong 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 5ec2e9c11e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)

Origin message was:
------------------
- audioplayer: allow RC_previoussong and RC_nextsong

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-10-30 17:33:42 +01:00
vanhofen
3b16a35dcd simple_display: re-add accidently removed lines ... 
Do we need this for showMenuText() and showAudioTrack() to?


Origin commit data
------------------
Commit: 73738c3445
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-30 (Mon, 30 Oct 2017)

Origin message was:
------------------
- simple_display: re-add accidently removed lines ...

Do we need this for showMenuText() and showAudioTrack() to?
 2017-10-30 08:31:20 +01:00
vanhofen
78489ce310 simple_display: fix display of volume in menu- and audio-mode ... 
small cleanups
use fixed timeout for clock

TODO: fix timeout for volume


Origin commit data
------------------
Commit: d8c0a6af06
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-30 (Mon, 30 Oct 2017)

Origin message was:
------------------
- simple_display: fix display of volume in menu- and audio-mode ...

small cleanups
use fixed timeout for clock

TODO: fix timeout for volume
 2017-10-30 01:44:02 +01:00
vanhofen
b5034aa4a8 simple_display: fix brightness settings when changing mode 
Origin commit data
------------------
Commit: bd013f86b7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-30 (Mon, 30 Oct 2017)

Origin message was:
------------------
- simple_display: fix brightness settings when changing mode
 2017-10-30 01:44:02 +01:00