Commit Graph

136 Commits

Author SHA1 Message Date
Jacek Jendrzej
a91765a685 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ad4a0e6cc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-02 (Mon, 02 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-02 13:56:25 +02:00
Stefan Seyfried
ef71d00d7f remove "using namespace std" from header files
"using namespace std" in headers is considered bad practice, so move it
either into the respective cpp files or (for files which have lots of
other std::xxx usage anyway) just write it out explicitly.
Looking at the headers and the affected cpp files, one can actually see
why it is bad practice, as it's spreading very far ;-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d9139054a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-01 (Sun, 01 Oct 2017)



------------------
This commit was generated by Migit
2017-10-02 13:43:57 +02:00
Michael Liebmann
106e64707d Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: abfb02aa47
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-21 (Thu, 21 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-21 09:07:15 +02:00
vanhofen
bdbe2f5ab8 add and use FRAME_WIDTH defines; ...
replace other fixed frame widths with OFFSET defines

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6ee3e54741
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-20 (Wed, 20 Sep 2017)

Origin message was:
------------------
- add and use FRAME_WIDTH defines; ...

replace other fixed frame widths with OFFSET defines

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


------------------
This commit was generated by Migit
2017-09-20 21:29:53 +02:00
Jacek Jendrzej
0b9ac652bf Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca83324763
Author: Jacek Jendrzej <overx300@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 16:20:47 +02:00
Michael Liebmann
7329fb6294 CInfoViewer::showTitle: Add parameter forcePaintButtonBar
Origin commit data
------------------
Branch: ni/coolstream
Commit: cc05d272f2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-28 15:04:09 +01:00
Stefan Seyfried
86f609bc17 replace fontrenderer.h include with forward declaration
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2303d94300
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)



------------------
This commit was generated by Migit
2017-02-07 17:23:42 +01:00
Stefan Seyfried
7e25a8dace replace fontrenderer.h include with forward declaration
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9082ddf287
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)



------------------
This commit was generated by Migit
2017-02-05 13:37:53 +01:00
Stefan Seyfried
d6861c1054 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: a409047714
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-22 (Sun, 22 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-22 22:59:39 +01:00
vanhofen
71213a44ad infoviewer_bb: use OFFSET defines in getBBIconInfo()
Origin commit data
------------------
Branch: ni/coolstream
Commit: b48c657991
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-02 (Mon, 02 Jan 2017)

Origin message was:
------------------
- infoviewer_bb: use OFFSET defines in getBBIconInfo()

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

------------------
This commit was generated by Migit
2017-01-02 23:51:12 +01:00
vanhofen
f18129424a infoviewer_bb: remove broken code around left/right handling in ca_bar
This code wasn't used anymore since years.


Origin commit data
------------------
Branch: ni/coolstream
Commit: aa9417a550
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)

Origin message was:
------------------
- infoviewer_bb: remove broken code around left/right handling in ca_bar

This code wasn't used anymore since years.


------------------
This commit was generated by Migit
2016-12-12 11:15:14 +01:00
Stefan Seyfried
3f75ef5f47 Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-22 11:37:40 +02:00
vanhofen
bb756163b1 rename customcolor.h -> color_custom.h; reduce unneeded inludes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 104d21e784
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename customcolor.h -> color_custom.h; reduce unneeded inludes

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

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
a8cec5244c fonts: add and use own font for all footers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 54f2ac510f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- fonts: add and use own font for all footers

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

------------------
This commit was generated by Migit
2016-08-15 19:02:42 +02:00
vanhofen
df187346c4 infoviewer_bb: respecting user colors in buttonbar
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0274471517
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- infoviewer_bb: respecting user colors in buttonbar

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

------------------
This commit was generated by Migit
2016-08-15 12:29:23 +02:00
vanhofen
fb9eaf294f colors: make footer background color configurable
TODO: footer text color and maybe footer font


Origin commit data
------------------
Branch: ni/coolstream
Commit: cc5258e6d5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- colors: make footer background color configurable

TODO: footer text color and maybe footer font


------------------
This commit was generated by Migit
2016-08-15 00:14:47 +02:00
vanhofen
1c1c5a05f3 colors: some internal renamings
* INFOBAR_SHADOW to SHADOW because it's not only used in infoviewer
* INFOBAR_SHADOW_TEXT to MENUFOOT_TEXT because it's the proper name

This is in preparation to make footer colors configurable


Origin commit data
------------------
Branch: ni/coolstream
Commit: bc39d1e14e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-14 (Sun, 14 Aug 2016)

Origin message was:
------------------
- colors: some internal renamings

* INFOBAR_SHADOW to SHADOW because it's not only used in infoviewer
* INFOBAR_SHADOW_TEXT to MENUFOOT_TEXT because it's the proper name

This is in preparation to make footer colors configurable


------------------
This commit was generated by Migit
2016-08-14 21:55:18 +02:00
vanhofen
fe7c215286 infoviewer_bb: show resolution in livestream mode on color button
Origin commit data
------------------
Branch: ni/coolstream
Commit: 07b1f6f849
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)

Origin message was:
------------------
- infoviewer_bb: show resolution in livestream mode on color button

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

------------------
This commit was generated by Migit
2016-03-03 09:46:42 +01:00
Michael Liebmann
4f41565587 movieplayer: Use Lua scripts for selecting live stream urls
Origin commit data
------------------
Branch: ni/coolstream
Commit: b4a2856e1c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-03-03 (Thu, 03 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-03 09:46:42 +01:00
Thilo Graf
a58e36001d CInfoViewerBB: ensure reinit bboffset before paint ca bar and footer
Value of bb offset was only initialized on bb init. If a user has changed
ca bar settings (e.g. enable/disable frame around ca bar) while runtime, the
current offset value could be wrong and infoviewer has display errors.
To solve this restart of neutrino was required.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f3df3a5a8
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-17 (Wed, 17 Feb 2016)



------------------
This commit was generated by Migit
2016-02-17 10:18:44 +01:00
Thilo Graf
7e7744e56f CInfoViewerBB: try to fix repaint of sys scales after channel switch
Reset should force repaint and scales should be always visible after
footer paint.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3dc56386f5
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-16 (Tue, 16 Feb 2016)



------------------
This commit was generated by Migit
2016-02-16 11:11:38 +01:00
Michael Liebmann
8372065c10 CCDraw: Set cc_gradient_bg_cleanup to true
Except menu headers: Disable cleanup when save screen is disabled


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c72fe94bc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-29 (Fri, 29 Jan 2016)

Origin message was:
------------------
CCDraw: Set cc_gradient_bg_cleanup to true

 Except menu headers: Disable cleanup when save screen is disabled


------------------
This commit was generated by Migit
2016-01-29 15:31:12 +01:00
Michael Liebmann
8f75b392c0 Fix osd error on nevis
Origin commit data
------------------
Branch: ni/coolstream
Commit: 87e6f328dd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-27 (Wed, 27 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-27 10:07:33 +01:00
Michael Liebmann
3f0fb538fe Fix ghost text in infoviewer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8dd426d714
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-26 20:00:22 +01:00
vanhofen
8e70d9fe7e infoviewer: fix audio description in mode_webtv
Origin commit data
------------------
Branch: ni/coolstream
Commit: 32c28038a3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-26 (Tue, 26 Jan 2016)

Origin message was:
------------------
- infoviewer: fix audio description in mode_webtv

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

------------------
This commit was generated by Migit
2016-01-26 00:57:08 +01:00
vanhofen
7557f4eba9 Revert "- infoviewer_bb: use getMoviePlayerButtonName in mode_audio too;"
This reverts ugly commit b0fb5e4f83


Origin commit data
------------------
Branch: ni/coolstream
Commit: 61e457c0a6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-25 (Mon, 25 Jan 2016)



------------------
This commit was generated by Migit
2016-01-25 22:45:18 +01:00
vanhofen
b9b473032d infoviewer: supplement to 2f3352918f
Origin commit data
------------------
Branch: ni/coolstream
Commit: 766276df9f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-25 (Mon, 25 Jan 2016)

Origin message was:
------------------
- infoviewer: supplement to 2f3352918f

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

------------------
This commit was generated by Migit
2016-01-25 13:28:25 +01:00
vanhofen
2f3352918f Revert "- infoviewer_bb: use getMoviePlayerButtonName in mode_webtv too"
This reverts commit a3d801190c
because mode_webtv == (something like) live tv.
So the movieplayer button names shouldn't be displayed.

Conflicts:
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2786c13867
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-25 (Mon, 25 Jan 2016)



------------------
This commit was generated by Migit
2016-01-25 13:05:16 +01:00
vanhofen
921176b2a1 infoviewer: show plugin name, when movieplayer-plugin is selected
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b74f601db
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-25 (Mon, 25 Jan 2016)

Origin message was:
------------------
- infoviewer: show plugin name, when movieplayer-plugin is selected

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

------------------
This commit was generated by Migit
2016-01-25 12:00:47 +01:00
Stefan Seyfried
50cb7dd5d3 Merge remote-tracking branch 'n/cst-next-fixed'
Origin commit data
------------------
Branch: ni/coolstream
Commit: f5c72d35c8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-24 (Sun, 24 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-24 13:15:43 +01:00
vanhofen
0b8fa55400 infoviewer: fix overlaps on buttons while zapping
Origin commit data
------------------
Branch: ni/coolstream
Commit: 23242e605c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-22 (Fri, 22 Jan 2016)

Origin message was:
------------------
- infoviewer: fix overlaps on buttons while zapping

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

------------------
This commit was generated by Migit
2016-01-22 10:49:45 +01:00
vanhofen
a200d57ccf infoviewer: fix display of DolbyDigital icon
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2694b87d08
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-21 (Thu, 21 Jan 2016)

Origin message was:
------------------
- infoviewer: fix display of DolbyDigital icon

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

------------------
This commit was generated by Migit
2016-01-21 08:25:18 +01:00
Stefan Seyfried
a28613ab99 Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9113716171
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-01 (Fri, 01 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-01 14:10:48 +01:00
Thilo Graf
45c7d066d6 CInfoViewerBB: fix missing parameter
Shadow was lost after repaint


Origin commit data
------------------
Branch: ni/coolstream
Commit: f5fba42118
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-30 (Wed, 30 Dec 2015)



------------------
This commit was generated by Migit
2015-12-30 13:09:37 +01:00
vanhofen
e5a7522184 infoviewer_bb: use new infobar_buttons_usertitle key
Origin commit data
------------------
Branch: ni/coolstream
Commit: 974480fc4f
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-29 (Tue, 29 Dec 2015)

Origin message was:
------------------
- infoviewer_bb: use new infobar_buttons_usertitle key

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

------------------
This commit was generated by Migit
2015-12-29 14:31:52 +01:00
vanhofen
0e779b8b43 infoviewer_bb: remove labeling of audio control from green button ...
... now user can use any color key to control audio


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0561f6e663
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-29 (Tue, 29 Dec 2015)

Origin message was:
------------------
- infoviewer_bb: remove labeling of audio control from green button ...

 ... now user can use any color key to control audio


------------------
This commit was generated by Migit
2015-12-29 14:31:51 +01:00
vanhofen
dffafb7c6a infoviewer_bb: remove arbitrarily titles from color buttons
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d144ad685
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-27 (Sun, 27 Dec 2015)

Origin message was:
------------------
- infoviewer_bb: remove arbitrarily titles from color buttons

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

------------------
This commit was generated by Migit
2015-12-29 14:31:51 +01:00
vanhofen
b0fb5e4f83 infoviewer_bb: use getMoviePlayerButtonName in mode_audio too;
ugly workaround; why we're in mode_audio when using upnp-browser?
 do we need a mode_upnp?


Origin commit data
------------------
Branch: ni/coolstream
Commit: a2b28048d6
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-27 (Sun, 27 Dec 2015)

Origin message was:
------------------
- infoviewer_bb: use getMoviePlayerButtonName in mode_audio too;

 ugly workaround; why we're in mode_audio when using upnp-browser?
 do we need a mode_upnp?


------------------
This commit was generated by Migit
2015-12-29 14:31:51 +01:00
vanhofen
a3d801190c infoviewer_bb: use getMoviePlayerButtonName in mode_webtv too
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e51b5e252
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-27 (Sun, 27 Dec 2015)

Origin message was:
------------------
- infoviewer_bb: use getMoviePlayerButtonName in mode_webtv too

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

------------------
This commit was generated by Migit
2015-12-29 14:31:51 +01:00
Stefan Seyfried
0a95a07654 Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-28 16:15:14 +01:00
Michael Liebmann
f843e54380 CInfoViewerBB: try to fix missing sys scales in infoviewer
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: f111ccc98e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-12-26 (Sat, 26 Dec 2015)



------------------
This commit was generated by Migit
2015-12-27 14:42:31 +01:00
Thilo Graf
9f101bddbc Colors: init global color gradient implementation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 523b273af8
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-19 (Thu, 19 Nov 2015)


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

------------------
This commit was generated by Migit
2015-12-27 14:42:27 +01:00
Stefan Seyfried
5b0debf29a Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2d949bce16
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-15 (Tue, 15 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-15 17:29:18 +01:00
vanhofen
faacdb65cd infoviewer_bb: don't paint deactivated buttons
Origin commit data
------------------
Branch: ni/coolstream
Commit: 47eb2e27ec
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-14 (Mon, 14 Dec 2015)

Origin message was:
------------------
- infoviewer_bb: don't paint deactivated buttons

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

------------------
This commit was generated by Migit
2015-12-15 08:15:17 +01:00
vanhofen
70afef5d94 infoviewer: do always show all buttons; enable is controlled by usermenu
Origin commit data
------------------
Branch: ni/coolstream
Commit: a52a0e6c1b
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-14 (Mon, 14 Dec 2015)

Origin message was:
------------------
- infoviewer: do always show all buttons; enable is controlled by usermenu

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

------------------
This commit was generated by Migit
2015-12-15 08:15:17 +01:00
vanhofen
e26a06ed8f infoviewer_bb: fix text for green button in movieplayer mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: a50bd5bb97
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-14 (Mon, 14 Dec 2015)

Origin message was:
------------------
- infoviewer_bb: fix text for green button in movieplayer mode

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

------------------
This commit was generated by Migit
2015-12-15 08:15:17 +01:00
vanhofen
b878ae9989 infoviewer_bb: use key-assignment from movieplayer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c7cea95e9
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-14 (Mon, 14 Dec 2015)

Origin message was:
------------------
- infoviewer_bb: use key-assignment from movieplayer

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

------------------
This commit was generated by Migit
2015-12-15 08:15:17 +01:00
vanhofen
26262408e1 infoviewer_bb: rename infobar buttons
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ccb57548b
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-14 (Mon, 14 Dec 2015)

Origin message was:
------------------
- infoviewer_bb: rename infobar buttons

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

------------------
This commit was generated by Migit
2015-12-15 08:15:17 +01:00
Michael Liebmann
35bc32bbc1 infoviewer_bb: fix display of red button in movieplayer mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: ab7e3956df
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-12-14 (Mon, 14 Dec 2015)

Origin message was:
------------------
- infoviewer_bb: fix display of red button in movieplayer mode

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

------------------
This commit was generated by Migit
2015-12-15 08:15:17 +01:00
Stefan Seyfried
5f89c9a312 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)



------------------
This commit was generated by Migit
2015-12-13 17:41:55 +01:00