64 Commits

Author SHA1 Message Date
vanhofen
0b4e53a23d hardware_caps: add boxmodel
Origin commit data
------------------
Branch: ni/coolstream
Commit: dbf3e77a92
Author: vanhofen <vanhofen@gmx.de>
Date: 2024-01-03 (Wed, 03 Jan 2024)

Origin message was:
------------------
- hardware_caps: add boxmodel

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

------------------
This commit was generated by Migit
2024-01-03 22:24:53 +01:00
GetAway
cb44c90036 movieplayer.cpp: A new member function setPlaybackPtr(cPlayback *ptr) is implemented within the cVideo class to set the playback callback pointer.
This prevents showing pictures with the videoDecoder while movieplayer is paused


Origin commit data
------------------
Branch: ni/coolstream
Commit: d2ad17d01f
Author: GetAway <get-away@t-online.de>
Date: 2023-08-16 (Wed, 16 Aug 2023)



------------------
This commit was generated by Migit
2023-08-16 21:03:37 +02:00
GetAway
6a0a8c1385 fb_generic.cpp: adapt to "Refactor video.cpp: Convert void function to bool function for enhanced result checking"
- this only affects CST


Origin commit data
------------------
Branch: ni/coolstream
Commit: 320c6c1227
Author: GetAway <get-away@t-online.de>
Date: 2023-08-16 (Wed, 16 Aug 2023)



------------------
This commit was generated by Migit
2023-08-16 21:03:37 +02:00
vanhofen
c27d0b304d libcoolstream-headers: adapt to "reload webtv/iptv stream if connection lost"
Origin commit data
------------------
Branch: ni/coolstream
Commit: aac826baa5
Author: vanhofen <vanhofen@gmx.de>
Date: 2023-07-22 (Sat, 22 Jul 2023)

Origin message was:
------------------
- libcoolstream-headers: adapt to "reload webtv/iptv stream if connection lost"

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

------------------
This commit was generated by Migit
2023-07-22 13:49:28 +02:00
vanhofen
323edb4b26 cst/hardware-caps: add pip_devs
Origin commit data
------------------
Branch: ni/coolstream
Commit: 84147b8b83
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-10-02 (Sat, 02 Oct 2021)

Origin message was:
------------------
- cst/hardware-caps: add pip_devs

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

------------------
This commit was generated by Migit
2021-10-02 22:33:10 +02:00
vanhofen
29d88ac2ac hw_caps: introduce can_pip
Origin commit data
------------------
Branch: ni/coolstream
Commit: 997f5818c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-05-29 (Sat, 29 May 2021)

Origin message was:
------------------
- hw_caps: introduce can_pip

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

------------------
This commit was generated by Migit
2021-05-29 21:16:57 +02:00
vanhofen
cb94835a1a hwcaps: add has_HDMI_input
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a3eccb2d6
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-05-10 (Mon, 10 May 2021)

Origin message was:
------------------
- hwcaps: add has_HDMI_input

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

------------------
This commit was generated by Migit
2021-05-10 23:29:11 +02:00
vanhofen
624251c888 hwcaps: add display_can_umlauts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6dd2d2bb80
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-05-09 (Sun, 09 May 2021)

Origin message was:
------------------
- hwcaps: add display_can_umlauts

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

------------------
This commit was generated by Migit
2021-05-09 21:04:09 +02:00
FlatTV
da95c4d892 FIX AC3 audio for CST. Including audio AC3 switching by audio language menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: dd33384eb8
Author: FlatTV <FlatTV@gmx.de>
Date: 2021-04-22 (Thu, 22 Apr 2021)


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

------------------
This commit was generated by Migit
2021-04-22 20:23:39 +02:00
vanhofen
65200e2570 hw_caps: sync with libstb-hal; fix cst build
Origin commit data
------------------
Branch: ni/coolstream
Commit: 70d7fd047d
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-11-23 (Mon, 23 Nov 2020)

Origin message was:
------------------
- hw_caps: sync with libstb-hal; fix cst build

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

------------------
This commit was generated by Migit
2020-11-23 21:01:26 +01:00
vanhofen
f437a55a08 hw_caps/cst: introduce startup_file
Origin commit data
------------------
Branch: ni/coolstream
Commit: a14b50fa46
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-11-22 (Sun, 22 Nov 2020)

Origin message was:
------------------
- hw_caps/cst: introduce startup_file

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

------------------
This commit was generated by Migit
2020-11-22 21:07:41 +01:00
vanhofen
deae82f80e lib/hardware: introduce can_cpufreq to control the cpu frequency
Origin commit data
------------------
Branch: ni/coolstream
Commit: 258aae865f
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-08-30 (Sun, 30 Aug 2020)

Origin message was:
------------------
- lib/hardware: introduce can_cpufreq to control the cpu frequency

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

------------------
This commit was generated by Migit
2020-08-30 22:49:37 +02:00
GetAway
5273c80a31 hardware_caps.cpp: introduce display_has_colon for coolstream
Origin commit data
------------------
Branch: ni/coolstream
Commit: f91d5ecad8
Author: GetAway <get-away@t-online.de>
Date: 2020-07-16 (Thu, 16 Jul 2020)


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

------------------
This commit was generated by Migit
2020-07-16 20:07:12 +02:00
vanhofen
b0829105df simple_display: allow to control led brightness for some vuplus boxmodels
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b7f176a5e
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-10-28 (Mon, 28 Oct 2019)

Origin message was:
------------------
- simple_display: allow to control led brightness for some vuplus boxmodels

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

------------------
This commit was generated by Migit
2019-10-28 22:36:28 +01:00
vanhofen
c5608d0c44 libcoolstream: enable GetMetadata() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: f833cc5e7d
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-08-04 (Sun, 04 Aug 2019)

Origin message was:
------------------
- libcoolstream: enable GetMetadata() function

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

------------------
This commit was generated by Migit
2019-08-04 19:18:55 +02:00
vanhofen
6c3b341910 move playback.h compatibility header file to the other ones
Origin commit data
------------------
Branch: ni/coolstream
Commit: b87b7d3c49
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-22 (Sat, 22 Dec 2018)

Origin message was:
------------------
- move playback.h compatibility header file to the other ones

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

------------------
This commit was generated by Migit
2018-12-22 20:17:24 +01:00
GetAway
baaea9ec6f videosettings.cpp: use hw_caps->has_button_vformat
Origin commit data
------------------
Branch: ni/coolstream
Commit: cf07ebb3b1
Author: GetAway <get-away@t-online.de>
Date: 2018-12-01 (Sat, 01 Dec 2018)


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

------------------
This commit was generated by Migit
2018-12-01 18:03:25 +01:00
vanhofen
2b42c72182 hardware_caps: introduce caps.has_button_timer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c3decd04a
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-03-11 (Sun, 11 Mar 2018)

Origin message was:
------------------
- hardware_caps: introduce caps.has_button_timer

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

------------------
This commit was generated by Migit
2018-03-11 22:43:23 +01:00
vanhofen
487097fc8d libcoolstream-headers: remove obsolete dummy members
Origin commit data
------------------
Branch: ni/coolstream
Commit: f2aff125c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)

Origin message was:
------------------
- libcoolstream-headers: remove obsolete dummy members

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

------------------
This commit was generated by Migit
2018-01-03 11:55:54 +01:00
vanhofen
59ffd5a265 hardware_caps: fix compile for coolstream; add missing member to header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 06036f2387
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)

Origin message was:
------------------
- hardware_caps: fix compile for coolstream; add missing member to header

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

------------------
This commit was generated by Migit
2017-11-13 20:59:39 +01:00
vanhofen
463fe111c0 hardware_caps: add display_has_statusline member
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2eeeb3fd45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)

Origin message was:
------------------
- hardware_caps: add display_has_statusline member

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

------------------
This commit was generated by Migit
2017-11-13 10:10:45 +01:00
vanhofen
88d5909c47 streaminfo: fix compile for coolstream; add dummies to libcs-headers
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff04c8ce97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-07 (Tue, 07 Nov 2017)

Origin message was:
------------------
- streaminfo: fix compile for coolstream; add dummies to libcs-headers

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

------------------
This commit was generated by Migit
2017-11-07 07:49:49 +01:00
vanhofen
55daa20bed 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
------------------
Branch: ni/coolstream
Commit: 1fa735aa45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)



------------------
This commit was generated by Migit
2017-11-03 00:09:05 +01:00
vanhofen
efab8d4e42 rename can_set_display_brightness => display_can_set_brightness
Signed-off-by: Thilo Graf <dbt@novatux.de>


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


------------------
This commit was generated by Migit
2017-11-02 21:23:01 +01:00
vanhofen
b72104b56f 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
------------------
Branch: ni/coolstream
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.


------------------
This commit was generated by Migit
2017-11-02 21:22:01 +01:00
vanhofen
3f1cee6a3b rename can_set_display_brightness => display_can_set_brightness
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2017-11-01 15:17:52 +01:00
vanhofen
0184232110 vfd-setup: use new display_can_deepstandby member from libstb-hal
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2017-11-01 15:10:38 +01:00
Thilo Graf
1ddcc24bc7 CScreenShot: fix build
Some lines were wrong picked


Origin commit data
------------------
Branch: ni/coolstream
Commit: b26fc7fb8d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)



------------------
This commit was generated by Migit
2017-10-29 18:48:28 +01:00
vanhofen
24e3d9bb05 audio_select: copy full code from TangoCash
Just compile tested. Maybe some more alignments needed.

Signed-off-by: Thilo Graf <dbt@novatux.de>
Additional changes on cs playback_cs.h, because broken build
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5fd7ec68ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- audio_select: copy full code from TangoCash

Just compile tested. Maybe some more alignments needed.

Signed-off-by: Thilo Graf <dbt@novatux.de>
Additional changes on cs playback_cs.h, because broken build
Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-10-29 18:32:30 +01:00
vanhofen
6bca93d258 add hd51; mostly ported from TangoCash's neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fe5d269af
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)

Origin message was:
------------------
- add hd51; mostly ported from TangoCash's neutrino-mp

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

------------------
This commit was generated by Migit
2017-10-29 18:31:30 +01:00
vanhofen
fec86c7ee5 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
------------------
Branch: ni/coolstream
Commit: fd25630d53
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-30 (Wed, 30 Aug 2017)



------------------
This commit was generated by Migit
2017-08-30 18:11:59 +02:00
vanhofen
4198cb9a35 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c35e98212
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)



------------------
This commit was generated by Migit
2017-08-25 14:15:22 +02:00
Jacek Jendrzej
640171523a Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c45b2eea6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-21 13:13:03 +02:00
vanhofen
cb19741014 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2017-08-21 12:56:00 +02:00
Jacek Jendrzej
1f09810ff1 part from ceab6aafbb
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0238049daf
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-21 10:57:18 +02:00
Stefan Seyfried
fe7c56581b Revert "- hardware_caps: fix has_fan and add detection of Neo Twin"
This reverts commit 2770d07bea.
This leads to a segfault at start and the upstream solution
is not yet ready for primetime, so revert this for now.


Origin commit data
------------------
Branch: ni/coolstream
Commit: e2db590797
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)



------------------
This commit was generated by Migit
2017-08-21 10:17:05 +02:00
vanhofen
ceab6aafbb 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
------------------
Branch: ni/coolstream
Commit: 382181e289
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


------------------
This commit was generated by Migit
2017-08-14 10:56:45 +02:00
Michael Liebmann
909cf0482d Revert "HD1: Workaround for missing cs_get_chip_type"
This reverts commit f273871fcf.


Origin commit data
------------------
Branch: ni/coolstream
Commit: e3cc6cee67
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-16 (Fri, 16 Jun 2017)



------------------
This commit was generated by Migit
2017-06-16 19:33:29 +02:00
vanhofen
faa10f0ed6 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c68ae57571
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
2017-06-15 11:07:32 +02:00
vanhofen
9d69ed31b0 vfd-setup: fix brightness setup for CST's boxmodel "Link" ...
and hide the brightness menu for all "Trinity" models. There's no display.

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4295839526
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- vfd-setup: fix brightness setup for CST's boxmodel "Link" ...

and hide the brightness menu for all "Trinity" models. There's no display.

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


------------------
This commit was generated by Migit
2017-06-15 01:01:55 +02:00
vanhofen
e4f4307eb6 vfd-setup: fix brightness setup for CST's boxmodel "Link" ...
and hide the brightness menu for all "Trinity" models. There's no display.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c0d367dca9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-12 (Mon, 12 Jun 2017)

Origin message was:
------------------
- vfd-setup: fix brightness setup for CST's boxmodel "Link" ...

and hide the brightness menu for all "Trinity" models. There's no display.


------------------
This commit was generated by Migit
2017-06-12 13:14:32 +02:00
vanhofen
4b2d0d89af Revert "HD1: Workaround for missing cs_get_chip_type"
This reverts commit f273871fcf.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 54d7350a11
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)



------------------
This commit was generated by Migit
2017-06-07 23:38:40 +02:00
Michael Liebmann
f273871fcf HD1: Workaround for missing cs_get_chip_type
Origin commit data
------------------
Branch: ni/coolstream
Commit: a6fe60d60a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-07 14:16:11 +02:00
vanhofen
4a4762935b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	acinclude.m4


Origin commit data
------------------
Branch: ni/coolstream
Commit: a9842aa1d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)



------------------
This commit was generated by Migit
2017-03-26 23:25:43 +02:00
Michael Liebmann
089f59cc26 hd[1|2]/libcoolstream: Update headers for new libcoolstream functions
libcoolstream-mt.so version 3.2.0 required

 Functions:
 - updateOsdScreenInfo()
 - GetVideoSystem()
 - GetVideoSystemFormatName()
 - fbCopy()
 - fbFill()
 - cs_set_extra_debug()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9bc2d9b95e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-22 (Wed, 22 Mar 2017)

Origin message was:
------------------
hd[1|2]/libcoolstream: Update headers for new libcoolstream functions

 libcoolstream-mt.so version 3.2.0 required

 Functions:
  - updateOsdScreenInfo()
  - GetVideoSystem()
  - GetVideoSystemFormatName()
  - fbCopy()
  - fbFill()
  - cs_set_extra_debug()


------------------
This commit was generated by Migit
2017-03-22 01:23:45 +01:00
vanhofen
2aa18cd5e1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: ed38125791
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)



------------------
This commit was generated by Migit
2017-03-19 01:07:17 +01:00
vanhofen
2770d07bea hardware_caps: fix has_fan and add detection of Neo Twin
Origin commit data
------------------
Branch: ni/coolstream
Commit: c225c2d4b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- hardware_caps: fix has_fan and add detection of Neo Twin

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

------------------
This commit was generated by Migit
2017-03-19 01:04:48 +01:00
vanhofen
ca99393430 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)



------------------
This commit was generated by Migit
2017-03-12 22:03:03 +01:00
vanhofen
f5984b6843 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 114392256c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-10 15:21:17 +01:00
vanhofen
07da62e157 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	lib/hardware/coolstream/hd2/libcoolstream/cs_api.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c95f1f7a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)



------------------
This commit was generated by Migit
2017-03-10 15:10:04 +01:00