Commit Graph

13700 Commits

Author SHA1 Message Date
vanhofen
4c2148ee01 movieplayer: remove unneeded ifdef ENABLE_LUA
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c65ebbd73
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-30 (Sat, 30 Dec 2017)

Origin message was:
------------------
- movieplayer: remove unneeded ifdef ENABLE_LUA

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

------------------
This commit was generated by Migit
2018-01-03 11:36:47 +01:00
vanhofen
d8d943254f movieplayer: minor changes in commented code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 58afdfdff1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-30 (Sat, 30 Dec 2017)

Origin message was:
------------------
- movieplayer: minor changes in commented code

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

------------------
This commit was generated by Migit
2018-01-03 11:36:20 +01:00
vanhofen
cfa5aa6414 infoicons: avoid extern CInfoIcons; use getInstance() instead of this
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2018-01-03 10:49:50 +01:00
vanhofen
0043b082c9 yWeb: activate RC-sub keys on remote controls
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2018-01-03 09:17:30 +01:00
vanhofen
f81f069d7e movieplayer: show timeosd when set position
Origin commit data
------------------
Branch: ni/coolstream
Commit: 19079a930c
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)

Origin message was:
------------------
- movieplayer: show timeosd when set position

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

------------------
This commit was generated by Migit
2018-01-03 01:41:10 +01:00
vanhofen
8bb0fa5113 movieplayer: remove unused RC_red handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2fd023def3
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)

Origin message was:
------------------
- movieplayer: remove unused RC_red handling

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

------------------
This commit was generated by Migit
2018-01-03 01:41:10 +01:00
vanhofen
3d05eb2b52 movieplayer: divide bisectional jumps in half only if direction is changed
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2018-01-03 01:41:10 +01:00
vanhofen
4f505d6188 neutrino: fix usermenu calls for fileplayback_video/audio
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2018-01-02 13:23:38 +01:00
vanhofen
5c837b9c98 movieplayer: remove unused "netstream" handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: e4c4f8da35
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-02 (Tue, 02 Jan 2018)

Origin message was:
------------------
- movieplayer: remove unused "netstream" handling

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

------------------
This commit was generated by Migit
2018-01-02 13:23:37 +01:00
FlatTV
4d3851f86a Merge branch 'ni/mp/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ebe71f8d49
Author: FlatTV <FlatTV@gmx.de>
Date: 2018-01-01 (Mon, 01 Jan 2018)


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

------------------
This commit was generated by Migit
2018-01-01 14:12:24 +01:00
FlatTV
29bef65a4c 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
------------------
Branch: ni/coolstream
Commit: d844da88c6
Author: FlatTV <FlatTV@gmx.de>
Date: 2018-01-01 (Mon, 01 Jan 2018)



------------------
This commit was generated by Migit
2018-01-01 14:01:03 +01:00
vanhofen
6d01bd637a deutsch.locale: fix merge error leftovers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 21bc82c001
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-28 (Thu, 28 Dec 2017)

Origin message was:
------------------
- deutsch.locale: fix merge error leftovers

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

------------------
This commit was generated by Migit
2017-12-28 21:48:20 +01:00
vanhofen
a7ea4c4130 movieplayer: remove obsolete playback->SetTeletextPid() call
Origin commit data
------------------
Branch: ni/coolstream
Commit: c401847450
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-27 (Wed, 27 Dec 2017)

Origin message was:
------------------
- movieplayer: remove obsolete playback->SetTeletextPid() call

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

------------------
This commit was generated by Migit
2017-12-27 00:49:34 +01:00
vanhofen
2201ba7940 movieplayer: remove CRCInput::RC_text handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca873d64b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-27 (Wed, 27 Dec 2017)

Origin message was:
------------------
- movieplayer: remove CRCInput::RC_text handling

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

------------------
This commit was generated by Migit
2017-12-27 00:49:34 +01:00
vanhofen
9871b4a1ff movieplayer: add missing std
Origin commit data
------------------
Branch: ni/coolstream
Commit: b0560efc31
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-27 (Wed, 27 Dec 2017)

Origin message was:
------------------
- movieplayer: add missing std

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

------------------
This commit was generated by Migit
2017-12-27 00:49:34 +01:00
vanhofen
8fdf102717 movieplayer: remove obsolete static bool running handling
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2017-12-27 00:49:34 +01:00
vanhofen
dad4bdaa6f movieplayer: remove unused 3d-code
Origin commit data
------------------
Branch: ni/coolstream
Commit: e65e40680f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-27 (Wed, 27 Dec 2017)

Origin message was:
------------------
- movieplayer: remove unused 3d-code

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

------------------
This commit was generated by Migit
2017-12-27 00:49:34 +01:00
vanhofen
10065141b4 movieplayer: remove unused ENABLE_GRAPHLCD code
Origin commit data
------------------
Branch: ni/coolstream
Commit: c19c12bb8b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)

Origin message was:
------------------
- movieplayer: remove unused ENABLE_GRAPHLCD code

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

------------------
This commit was generated by Migit
2017-12-26 23:27:33 +01:00
vanhofen
a12d7ccffc movieplayer: remove unused code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 353eba2582
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)

Origin message was:
------------------
- movieplayer: remove unused code

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

------------------
This commit was generated by Migit
2017-12-26 23:25:56 +01:00
Stefan Seyfried
abfd7f3155 dboxinfo: allow to show "neutrino uptime"
Origin commit data
------------------
Branch: ni/coolstream
Commit: a98f94621a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)


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

------------------
This commit was generated by Migit
2017-12-26 22:58:37 +01:00
Stefan Seyfried
725a69916a move automake's "foreign" switch to the proper place
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c33e1a82b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)


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

------------------
This commit was generated by Migit
2017-12-26 22:58:37 +01:00
Stefan Seyfried
286445cb07 cc_draw: add simple debug facility
not perfect, since the borders can be overdrawn afterwards
but still pretty useful


Origin commit data
------------------
Branch: ni/coolstream
Commit: 73c7885e72
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)



------------------
This commit was generated by Migit
2017-12-26 22:58:36 +01:00
Stefan Seyfried
db32ea5437 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
------------------
Branch: ni/coolstream
Commit: b4a3cf14c1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)



------------------
This commit was generated by Migit
2017-12-26 22:58:36 +01:00
Stefan Seyfried
e016bd1e7f infoviewer: revert useless big box for running time
The box is two times too big, truncating long EPG titles.


Origin commit data
------------------
Branch: ni/coolstream
Commit: fe494a6814
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)



------------------
This commit was generated by Migit
2017-12-26 22:58:36 +01:00
Stefan Seyfried
9bb5953478 deutsch.locale: fix typo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 120cc5befa
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)


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

------------------
This commit was generated by Migit
2017-12-26 22:58:36 +01:00
Stefan Seyfried
3cf2a4dbfb Channellist: only show lock icon if parental lock is active
additionally, remove the icon on change to an unlocked bouquet


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8ab511fdbc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)



------------------
This commit was generated by Migit
2017-12-26 22:58:36 +01:00
Stefan Seyfried
94bb966c90 CComponentsHeader: fix text position if icon is removed
Origin commit data
------------------
Branch: ni/coolstream
Commit: 207a49994e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)


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

------------------
This commit was generated by Migit
2017-12-26 22:58:36 +01:00
vanhofen
8c523d6d57 update: more logic in some ifdef's
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2017-12-26 01:19:57 +01:00
vanhofen
924d86ae17 update: cleanup and unify debug output
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c6a4ba634
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-26 (Tue, 26 Dec 2017)

Origin message was:
------------------
- update: cleanup and unify debug output

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

------------------
This commit was generated by Migit
2017-12-26 00:36:06 +01:00
vanhofen
e726b1cdf7 update: fix some defines for ARM_HARDWARE
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2017-12-26 00:36:06 +01:00
vanhofen
8925636772 update: modify LIST_OF_UPDATES_LOCAL_FILENAME define
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2017-12-26 00:36:06 +01:00
vanhofen
19dcf27d8d update: remove unused UPDATE_LOCAL_FILENAME define
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2017-12-26 00:36:06 +01:00
vanhofen
19c2d7f11b update: move RELEASE_CYCLE define to configure.ac
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2017-12-26 00:36:06 +01:00
Jacek Jendrzej
5a9380eed3 try to fix next file play on AX
Origin commit data
------------------
Branch: ni/coolstream
Commit: 12166952f7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-12-23 (Sat, 23 Dec 2017)


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

------------------
This commit was generated by Migit
2017-12-23 21:04:32 +01:00
Jacek Jendrzej
573d692561 fix play stop on cst after hd51 merge
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0e208db362
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-12-23 (Sat, 23 Dec 2017)


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

------------------
This commit was generated by Migit
2017-12-23 21:04:21 +01:00
Thilo Graf
2335deb9a0 CNetworkSetup: cleanup and unify debug output
Origin commit data
------------------
Branch: ni/coolstream
Commit: e092aed3f1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-12-23 (Sat, 23 Dec 2017)


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

------------------
This commit was generated by Migit
2017-12-23 17:10:47 +01:00
Thilo Graf
60433a1d3b 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2017-12-23 17:10:29 +01:00
vanhofen
92be9bf775 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
------------------
Branch: ni/coolstream
Commit: 0caa10ef43
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-21 (Thu, 21 Dec 2017)



------------------
This commit was generated by Migit
2017-12-21 22:28:12 +01:00
Thilo Graf
624408f633 update version to 3.7.0
eplayer beta


Origin commit data
------------------
Branch: ni/coolstream
Commit: 946d9e4bd6
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-12-21 (Thu, 21 Dec 2017)



------------------
This commit was generated by Migit
2017-12-21 12:11:14 +01:00
vanhofen
594d66db51 user-menu: avoid empty headers in user-menu
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
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>


------------------
This commit was generated by Migit
2017-12-21 12:11:13 +01:00
TangoCash
ec600df09a filebrowser: add size() and getFilter() members
Origin commit data
------------------
Branch: ni/coolstream
Commit: 97327f0212
Author: TangoCash <eric@loxat.de>
Date: 2017-12-20 (Wed, 20 Dec 2017)

Origin message was:
------------------
- filebrowser: add size() and getFilter() members

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

------------------
This commit was generated by Migit
2017-12-21 12:11:11 +01:00
Thilo Graf
efb7040b43 Fileplay: add separat fileplay for audio and video
Origin commit data
------------------
Branch: ni/coolstream
Commit: 91ee69f22e
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-12-21 (Thu, 21 Dec 2017)


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

------------------
This commit was generated by Migit
2017-12-21 12:10:40 +01:00
vanhofen
5b8e0f426e 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
------------------
Branch: ni/coolstream
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>


------------------
This commit was generated by Migit
2017-12-21 11:28:32 +01:00
vanhofen
2a4ff88f8c neutrino: add more RC_playpause handling
Conflicts:
	src/gui/movieplayer.cpp

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


Origin commit data
------------------
Branch: ni/coolstream
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>


------------------
This commit was generated by Migit
2017-12-21 11:28:30 +01:00
vanhofen
d94b1d35eb 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
------------------
Branch: ni/coolstream
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>


------------------
This commit was generated by Migit
2017-12-21 11:28:28 +01:00
vanhofen
485e81dacd rcinput: add RC_playpause key
Conflicts:
	src/driver/rcinput.cpp
	src/driver/rcinput.h

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: a4670c75a9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-19 (Tue, 19 Dec 2017)

Origin message was:
------------------
- rcinput: add RC_playpause key

 Conflicts:
	src/driver/rcinput.cpp
	src/driver/rcinput.h

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


------------------
This commit was generated by Migit
2017-12-21 11:28:27 +01:00
vanhofen
fdae603b41 zapit/bouquets: don't get auto-epgid from webchannels
Origin commit data
------------------
Branch: ni/coolstream
Commit: ebf071905e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-21 (Thu, 21 Dec 2017)

Origin message was:
------------------
- zapit/bouquets: don't get auto-epgid from webchannels

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

------------------
This commit was generated by Migit
2017-12-21 10:25:53 +01:00
vanhofen
14fa610ab5 bump neutrino version to 3.50
Origin commit data
------------------
Branch: ni/coolstream
Commit: 17b84a01e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-20 (Wed, 20 Dec 2017)

Origin message was:
------------------
- bump neutrino version to 3.50

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

------------------
This commit was generated by Migit
2017-12-20 23:16:32 +01:00
vanhofen
2f5f308dab neutrino.cpp: fix small merge error
Origin commit data
------------------
Branch: ni/coolstream
Commit: be611303cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-20 (Wed, 20 Dec 2017)

Origin message was:
------------------
- neutrino.cpp: fix small merge error

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

------------------
This commit was generated by Migit
2017-12-20 15:24:07 +01:00
vanhofen
bf4c5aa93c movieplayer: re-enable youtube playback
Origin commit data
------------------
Branch: ni/coolstream
Commit: a5448c8776
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-20 (Wed, 20 Dec 2017)

Origin message was:
------------------
- movieplayer: re-enable youtube playback

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

------------------
This commit was generated by Migit
2017-12-20 10:55:33 +01:00