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

13055 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vanhofen
2a30a9655b info-menu: fix streaminfo include 
Origin commit data
------------------
Commit: 434d9f659b
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)

Origin message was:
------------------
- info-menu: fix streaminfo include
 2018-01-03 13:58:50 +01:00
vanhofen
2f8efe0a69 libcoolstream-headers: remove obsolete dummy members 
Origin commit data
------------------
Commit: f2aff125c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)

Origin message was:
------------------
- libcoolstream-headers: remove obsolete dummy members
 2018-01-03 11:55:54 +01:00
vanhofen
7cb1943adf movieplayer: revert most code from terrible commit 7fcd8dea4c 
to get back working subtitles for COOL_HARDWARE


Origin commit data
------------------
Commit: 9704c796b5
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)

Origin message was:
------------------
- movieplayer: revert most code from terrible commit 7fcd8dea4c

to get back working subtitles for COOL_HARDWARE
 2018-01-03 11:55:54 +01:00
vanhofen
1680bde4b8 gui/Makefile: compile streaminfo1 instead of streaminfo2 for ARM_HARDWARE 
Origin commit data
------------------
Commit: 45674b7248
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)

Origin message was:
------------------
- gui/Makefile: compile streaminfo1 instead of streaminfo2 for ARM_HARDWARE
 2018-01-03 11:55:54 +01:00
vanhofen
2e5ce4bf28 Revert "- audio_select: copy full code from TangoCash" 
This reverts commit 18bbbbabfe.

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/audio_select.cpp
	src/system/setting_helpers.cpp
	src/system/setting_helpers.h


Origin commit data
------------------
Commit: 2cd2a8599c
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)
 2018-01-03 11:55:54 +01:00
vanhofen
d4af3caaef movieplayer: remove unneeded ifdef ENABLE_LUA 
Origin commit data
------------------
Commit: 4c65ebbd73
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-30 (Sat, 30 Dec 2017)

Origin message was:
------------------
- movieplayer: remove unneeded ifdef ENABLE_LUA
 2018-01-03 11:36:47 +01:00
vanhofen
97031be09b movieplayer: minor changes in commented code 
Origin commit data
------------------
Commit: 58afdfdff1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-30 (Sat, 30 Dec 2017)

Origin message was:
------------------
- movieplayer: minor changes in commented code
 2018-01-03 11:36:20 +01:00
vanhofen
dc27f0567c infoicons: avoid extern CInfoIcons; use getInstance() instead of this 
Origin commit data
------------------
Commit: 5a34b06137
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)

Origin message was:
------------------
- infoicons: avoid extern CInfoIcons; use getInstance() instead of this
 2018-01-03 10:49:50 +01:00
vanhofen
6ea9cc9e45 yWeb: activate RC-sub keys on remote controls 
Origin commit data
------------------
Commit: be821ed1c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)

Origin message was:
------------------
- yWeb: activate RC-sub keys on remote controls
 2018-01-03 09:17:30 +01:00
vanhofen
3056de9f5a movieplayer: show timeosd when set position 
Origin commit data
------------------
Commit: 19079a930c
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)

Origin message was:
------------------
- movieplayer: show timeosd when set position
 2018-01-03 01:41:10 +01:00
vanhofen
ecc7617051 movieplayer: remove unused RC_red handling 
Origin commit data
------------------
Commit: 2fd023def3
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)

Origin message was:
------------------
- movieplayer: remove unused RC_red handling
 2018-01-03 01:41:10 +01:00
vanhofen
ae9cbf88a5 movieplayer: divide bisectional jumps in half only if direction is changed 
Origin commit data
------------------
Commit: e018066d23
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)

Origin message was:
------------------
- movieplayer: divide bisectional jumps in half only if direction is changed
 2018-01-03 01:41:10 +01:00
vanhofen
0e4dd3a5e1 neutrino: fix usermenu calls for fileplayback_video/audio 
Origin commit data
------------------
Commit: a2e4c650fa
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-02 (Tue, 02 Jan 2018)

Origin message was:
------------------
- neutrino: fix usermenu calls for fileplayback_video/audio
 2018-01-02 13:23:38 +01:00
vanhofen
0e791db0eb movieplayer: remove unused "netstream" handling 
Origin commit data
------------------
Commit: e4c4f8da35
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-02 (Tue, 02 Jan 2018)

Origin message was:
------------------
- movieplayer: remove unused "netstream" handling
 2018-01-02 13:23:37 +01:00
FlatTV
ce5ded0cee Merge branch 'ni/mp/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/mp/tuxbox 
Origin commit data
------------------
Commit: ebe71f8d49
Author: FlatTV <FlatTV@gmx.de>
Date: 2018-01-01 (Mon, 01 Jan 2018)
 2018-01-01 14:12:24 +01:00
FlatTV
8f4f42f3f6 zapit.cpp: disable "tune channel, with stopped playback to not bypass the parental PIN check" on arm hardware 
Send capmt to socket only once after coldstart


Origin commit data
------------------
Commit: d844da88c6
Author: FlatTV <FlatTV@gmx.de>
Date: 2018-01-01 (Mon, 01 Jan 2018)
 2018-01-01 14:01:03 +01:00
vanhofen
5176333e4b deutsch.locale: fix merge error leftovers 
Origin commit data
------------------
Commit: 21bc82c001
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-28 (Thu, 28 Dec 2017)

Origin message was:
------------------
- deutsch.locale: fix merge error leftovers
 2017-12-28 21:48:20 +01:00
vanhofen
545b6b2975 movieplayer: remove obsolete playback->SetTeletextPid() call 
Origin commit data
------------------
Commit: c401847450
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-27 (Wed, 27 Dec 2017)

Origin message was:
------------------
- movieplayer: remove obsolete playback->SetTeletextPid() call
 2017-12-27 00:49:34 +01:00
vanhofen
cbbd384327 movieplayer: remove CRCInput::RC_text handling 
Origin commit data
------------------
Commit: ca873d64b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-27 (Wed, 27 Dec 2017)

Origin message was:
------------------
- movieplayer: remove CRCInput::RC_text handling
 2017-12-27 00:49:34 +01:00
vanhofen
f26d648544 movieplayer: add missing std 
Origin commit data
------------------
Commit: b0560efc31
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-27 (Wed, 27 Dec 2017)

Origin message was:
------------------
- movieplayer: add missing std
 2017-12-27 00:49:34 +01:00
vanhofen
d5e52be1a2 movieplayer: remove obsolete static bool running handling 
Origin commit data
------------------
Commit: 94c22c7ebe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-27 (Wed, 27 Dec 2017)

Origin message was:
------------------
- movieplayer: remove obsolete static bool running handling
 2017-12-27 00:49:34 +01:00
vanhofen
a1ee42c331 movieplayer: remove unused 3d-code 
Origin commit data
------------------
Commit: e65e40680f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-27 (Wed, 27 Dec 2017)

Origin message was:
------------------
- movieplayer: remove unused 3d-code
 2017-12-27 00:49:34 +01:00
vanhofen
1af03966c2 movieplayer: remove unused ENABLE_GRAPHLCD code 
Origin commit data
------------------
Commit: c19c12bb8b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)

Origin message was:
------------------
- movieplayer: remove unused ENABLE_GRAPHLCD code
 2017-12-26 23:27:33 +01:00
vanhofen
a227ccd9f9 movieplayer: remove unused code 
Origin commit data
------------------
Commit: 353eba2582
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)

Origin message was:
------------------
- movieplayer: remove unused code
 2017-12-26 23:25:56 +01:00
Stefan Seyfried
4895797537 dboxinfo: allow to show "neutrino uptime" 
Origin commit data
------------------
Commit: a98f94621a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)
 2017-12-26 22:58:37 +01:00
Stefan Seyfried
31f1ad426e move automake's "foreign" switch to the proper place 
Origin commit data
------------------
Commit: 2c33e1a82b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)
 2017-12-26 22:58:37 +01:00
Stefan Seyfried
4ee5ce23d3 cc_draw: add simple debug facility 
not perfect, since the borders can be overdrawn afterwards
but still pretty useful


Origin commit data
------------------
Commit: 73c7885e72
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)
 2017-12-26 22:58:36 +01:00
Stefan Seyfried
f321637a22 infoviewer: use all free space for epg title 
this should also avoid display artifacts due to runtime
changes in size of running time display


Origin commit data
------------------
Commit: b4a3cf14c1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)
 2017-12-26 22:58:36 +01:00
Stefan Seyfried
6e5d9a63bb infoviewer: revert useless big box for running time 
The box is two times too big, truncating long EPG titles.


Origin commit data
------------------
Commit: fe494a6814
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)
 2017-12-26 22:58:36 +01:00
Stefan Seyfried
4b354f9914 deutsch.locale: fix typo 
Origin commit data
------------------
Commit: 120cc5befa
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)
 2017-12-26 22:58:36 +01:00
Stefan Seyfried
2438c08aa5 Channellist: only show lock icon if parental lock is active 
additionally, remove the icon on change to an unlocked bouquet


Origin commit data
------------------
Commit: 8ab511fdbc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)
 2017-12-26 22:58:36 +01:00
Stefan Seyfried
8ee019b5ff CComponentsHeader: fix text position if icon is removed 
Origin commit data
------------------
Commit: 207a49994e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)
 2017-12-26 22:58:36 +01:00
vanhofen
52dc9f8ec1 update: more logic in some ifdef's 
Origin commit data
------------------
Commit: 2ddd0f79b7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)

Origin message was:
------------------
- update: more logic in some ifdef's
 2017-12-26 01:19:57 +01:00
vanhofen
6bcd60ef75 update: cleanup and unify debug output 
Origin commit data
------------------
Commit: 4c6a4ba634
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)

Origin message was:
------------------
- update: cleanup and unify debug output
 2017-12-26 00:36:06 +01:00
vanhofen
132ff1b687 update: fix some defines for ARM_HARDWARE 
Origin commit data
------------------
Commit: d09f93645f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)

Origin message was:
------------------
- update: fix some defines for ARM_HARDWARE
 2017-12-26 00:36:06 +01:00
vanhofen
a4ad7dfde1 update: modify LIST_OF_UPDATES_LOCAL_FILENAME define 
Origin commit data
------------------
Commit: 1b110cdc5e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)

Origin message was:
------------------
- update: modify LIST_OF_UPDATES_LOCAL_FILENAME define
 2017-12-26 00:36:06 +01:00
vanhofen
cd9542ed2a update: remove unused UPDATE_LOCAL_FILENAME define 
Origin commit data
------------------
Commit: 2caf1f6661
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)

Origin message was:
------------------
- update: remove unused UPDATE_LOCAL_FILENAME define
 2017-12-26 00:36:06 +01:00
vanhofen
61db02b977 update: move RELEASE_CYCLE define to configure.ac 
Origin commit data
------------------
Commit: 32a5689d19
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)

Origin message was:
------------------
- update: move RELEASE_CYCLE define to configure.ac
 2017-12-26 00:36:06 +01:00
Jacek Jendrzej
b0d8688bb5 try to fix next file play on AX 
Origin commit data
------------------
Commit: 12166952f7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-12-23 (Sat, 23 Dec 2017)
 2017-12-23 21:04:32 +01:00
Jacek Jendrzej
1fbaeb719a fix play stop on cst after hd51 merge 
Origin commit data
------------------
Commit: 0e208db362
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-12-23 (Sat, 23 Dec 2017)
 2017-12-23 21:04:21 +01:00
Thilo Graf
f981f6cec8 CNetworkSetup: cleanup and unify debug output 
Origin commit data
------------------
Commit: e092aed3f1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-12-23 (Sat, 23 Dec 2017)
 2017-12-23 17:10:47 +01:00
Thilo Graf
9e5e899604 CComponentsWindow: add method to set background image in window classes 
- setBodyBGImage() exists as member of base class CCDraw and had
 no visual effect in this class, because visibility of window container is disabled.
 This additional member overloads the original methode and is using functionality from
 window body object. Example for buildinfo added.

TODO:
- background behavior of embedded objects must be global adapted if a background image is used


Origin commit data
------------------
Commit: e53f35d939
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-12-23 (Sat, 23 Dec 2017)

Origin message was:
------------------
CComponentsWindow: add method to set background image in window classes

- setBodyBGImage() exists as member of base class CCDraw and had
 no visual effect in this class, because visibility of window container is disabled.
 This additional member overloads the original methode and is using functionality from
 window body object. Example for buildinfo added.

TODO:
- background behavior of embedded objects must be global adapted if a background image is used
 2017-12-23 17:10:29 +01:00
vanhofen
7a48382781 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	ChangeLog
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/filebrowser.cpp
	src/gui/filebrowser.h
	src/gui/mediaplayer.cpp
	src/gui/movieplayer.cpp
	src/gui/movieplayer.h
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/neutrino.cpp
	src/system/settings.h


Origin commit data
------------------
Commit: 0caa10ef43
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-21 (Thu, 21 Dec 2017)
 2017-12-21 22:28:12 +01:00
Thilo Graf
2e0dca30c2 update version to 3.7.0 
eplayer beta


Origin commit data
------------------
Commit: 946d9e4bd6
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-12-21 (Thu, 21 Dec 2017)
 2017-12-21 12:11:14 +01:00
vanhofen
2fdc4305ee user-menu: avoid empty headers in user-menu 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 3fef93574a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-20 (Wed, 20 Dec 2017)

Origin message was:
------------------
- user-menu: avoid empty headers in user-menu

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-12-21 12:11:13 +01:00
TangoCash
a17ca0ffe1 filebrowser: add size() and getFilter() members 
Origin commit data
------------------
Commit: 97327f0212
Author: TangoCash <eric@loxat.de>
Date: 2017-12-20 (Wed, 20 Dec 2017)

Origin message was:
------------------
- filebrowser: add size() and getFilter() members
 2017-12-21 12:11:11 +01:00
Thilo Graf
9a1f55a748 Fileplay: add separat fileplay for audio and video 
Origin commit data
------------------
Commit: 91ee69f22e
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-12-21 (Thu, 21 Dec 2017)
 2017-12-21 12:10:40 +01:00
vanhofen
fd9bdf47b3 user-menu: add audio fileplay item 
Conflicts:
	src/gui/user_menue_setup.cpp
	src/system/settings.h

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


Origin commit data
------------------
Commit: fb2d6f95e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-19 (Tue, 19 Dec 2017)

Origin message was:
------------------
- user-menu: add audio fileplay item

 Conflicts:
	src/gui/user_menue_setup.cpp
	src/system/settings.h

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-12-21 11:28:32 +01:00
vanhofen
365012a71c neutrino: add more RC_playpause handling 
Conflicts:
	src/gui/movieplayer.cpp

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


Origin commit data
------------------
Commit: 3d5aa5977a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-19 (Tue, 19 Dec 2017)

Origin message was:
------------------
- neutrino: add more RC_playpause handling

 Conflicts:
	src/gui/movieplayer.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-12-21 11:28:30 +01:00
vanhofen
b72303a68b neutrino: add RC_playpause handling; change some key defaults for ARM_HARDWARE 
Conflicts:
 src/neutrino.cpp

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


Origin commit data
------------------
Commit: c9e4712011
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-19 (Tue, 19 Dec 2017)

Origin message was:
------------------
- neutrino: add RC_playpause handling; change some key defaults for ARM_HARDWARE

 Conflicts:
  src/neutrino.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-12-21 11:28:28 +01:00