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
13,190 Commits 2 Branches 9 Tags
8c24feb848fd6183e204d96626e20cdd007d583b
Commit Graph

7707 Commits

Author SHA1 Message Date
vanhofen
96f85019d3 infoviewer: try to fix showLivestreamInfo() for audiostreams 
Origin commit data
------------------
Commit: c56753c8e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-04 (Sat, 04 Nov 2017)

Origin message was:
------------------
- infoviewer: try to fix showLivestreamInfo() for audiostreams
 2017-11-04 13:54:45 +01:00
vanhofen
71f1608ad1 movieplayer: try to fix rezap audiostreams 
Origin commit data
------------------
Commit: c5be130ba8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-04 (Sat, 04 Nov 2017)

Origin message was:
------------------
- movieplayer: try to fix rezap audiostreams
 2017-11-04 13:54:44 +01:00
vanhofen
c557a6bf06 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	src/driver/simple_display.cpp


Origin commit data
------------------
Commit: db0efcca40
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 22:40:43 +01:00
Jacek Jendrzej
03b2b13758 silence -Wparentheses-equality warning 
Origin commit data
------------------
Commit: 75fd96f6b7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 20:14:37 +01:00
vanhofen
252d05f8c6 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: ee9fb62dee
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 13:33:54 +01:00
vanhofen
d607c32508 Revert "remove pinentered script , revert 2eab1fa453b1772c8da2a40baa8a15411e3e8852" 
This reverts commit d00ede022c.


Origin commit data
------------------
Commit: f6692bff58
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 13:33:31 +01:00
vanhofen
df07208e75 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: ab1b8010a2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 13:05:34 +01:00
vanhofen
1ae9a82620 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: e691bceb94
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 13:04:12 +01:00
Jacek Jendrzej
d00ede022c remove pinentered script , revert 2eab1fa453 
Origin commit data
------------------
Commit: ec10cd64e5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 12:25:14 +01:00
vanhofen
5cc3392ec1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 9fd268cc31
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 11:09:51 +01:00
vanhofen
d38b57d43e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Commit: 255f1a0cff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 11:09:28 +01:00
vanhofen
38a431fcda media-menu: disable currently broken audioplayer for ARM_HARDWARE 
Origin commit data
------------------
Commit: 3d91cd9e13
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- media-menu: disable currently broken audioplayer for ARM_HARDWARE
 2017-11-03 10:47:31 +01:00
Jacek Jendrzej
d2ddd61d10 src/gui/movieplayer.cpp reEnable YT 
Origin commit data
------------------
Commit: 9ac5258ac0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 10:02:18 +01:00
Jacek Jendrzej
bab9fac99d src/gui/movieplayer.cpp fix page up/down jump and stop play after merge 
Origin commit data
------------------
Commit: 8746340a87
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 09:53:50 +01:00
vanhofen
4ad2dc407c infoviewer: fix timeout for new mode_webradio 
Origin commit data
------------------
Commit: ec3400f37d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- infoviewer: fix timeout for new mode_webradio
 2017-11-03 09:36:20 +01:00
vanhofen
bc7bbb92c1 movieplayer: fix for 6ce6fd0222648b0111e30a512ad88292e92c8a12 
Origin commit data
------------------
Commit: 6eea11af95
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- movieplayer: fix for 6ce6fd0222648b0111e30a512ad88292e92c8a12
 2017-11-03 09:36:20 +01:00
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
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
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
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
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
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
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
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
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
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
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
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
a932fa921c movieplayer: align some variables names to tango's names 
Origin commit data
------------------
Commit: 28fbb16cf9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-30 (Mon, 30 Oct 2017)

Origin message was:
------------------
- movieplayer: align some variables names to tango's names
 2017-10-30 01:44:01 +01:00
vanhofen
55bac2cf05 update: ask for copy settings to new image 
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- update: ask for copy settings to new image

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-10-29 21:47:16 +01:00
vanhofen
2c238b4c90 update_menue: hide expert functions for ARM_HARDWARE 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 68d8319d2d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-26 (Thu, 26 Oct 2017)

Origin message was:
------------------
- update_menue: hide expert functions for ARM_HARDWARE

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-10-29 21:38:46 +01:00
vanhofen
fa339bd7fb update: allow ofgwrite to flash another partition 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 80a9198603
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-26 (Thu, 26 Oct 2017)

Origin message was:
------------------
- update: allow ofgwrite to flash another partition

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-10-29 21:37:41 +01:00
vanhofen
77d30c4412 channellist: add separator item to menu for a smoother view 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: c14e9f8256
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-25 (Wed, 25 Oct 2017)

Origin message was:
------------------
- channellist: add separator item to menu for a smoother view

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-10-29 21:34:47 +01:00
vanhofen
f609c543ef update: fix osd flickering 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 9a364075ab
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-25 (Wed, 25 Oct 2017)

Origin message was:
------------------
- update: fix osd flickering

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-10-29 21:33:47 +01:00