Commit Graph

7423 Commits

Author SHA1 Message Date
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
ded2f065ae neutrino/upnpbrowser: add and use new mode_upnp; ...
... switch to correct mode before start playing audio/video/pic


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

Origin message was:
------------------
- neutrino/upnpbrowser: add and use new mode_upnp; ...

... switch to correct mode before start playing audio/video/pic


------------------
This commit was generated by Migit
2016-01-25 22:43:27 +01:00
vanhofen
f2903575d1 neutrino: allow to change to mode_ts before playback starts
Origin commit data
------------------
Branch: ni/coolstream
Commit: f1f9a1041c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-25 (Mon, 25 Jan 2016)

Origin message was:
------------------
- neutrino: allow to change to mode_ts before playback starts

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

------------------
This commit was generated by Migit
2016-01-25 22:40:58 +01:00
[CST] Focus
17232ec523 gui/movieplayer.cpp: pass subtitles charset to playback instance
Origin commit data
------------------
Branch: ni/coolstream
Commit: 85c437fac3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-01-25 (Mon, 25 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-25 18:16:16 +03: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
fea7c86ba5 infoviewer: change show_Data() semantics slightly
the "calledFromEvent" parameter was only used to force display of "no
EPG available". It was set to true when calling from an "zap complete"
or "epg event received" event, which is good, but also when calling from
the display update timer, which is "strange".
Now setting this parameter to false forces the update of the current
event (if available) which is done from display update timer.
This fixes the update of the remaining time display with constantly
displayed infobar (radio mode).


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9a6f9ea786
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-23 (Sat, 23 Jan 2016)



------------------
This commit was generated by Migit
2016-01-25 08:44:26 +01:00
vanhofen
b1177424b5 vfd: allow to disable rc-lock message on vfd
Origin commit data
------------------
Branch: ni/coolstream
Commit: b56f4ed149
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-25 (Mon, 25 Jan 2016)

Origin message was:
------------------
- vfd: allow to disable rc-lock message on vfd

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

------------------
This commit was generated by Migit
2016-01-25 08:04:35 +01:00
vanhofen
eeb5987454 plugins: startPlugin works with filename; just for clarity
Origin commit data
------------------
Branch: ni/coolstream
Commit: 55f0ab75af
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-24 (Sun, 24 Jan 2016)

Origin message was:
------------------
- plugins: startPlugin works with filename; just for clarity

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

------------------
This commit was generated by Migit
2016-01-24 21:29:31 +01:00
vanhofen
8e5d36fe25 plugins: fix movieplayer-plugin
Origin commit data
------------------
Branch: ni/coolstream
Commit: bbd88cd051
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-24 (Sun, 24 Jan 2016)

Origin message was:
------------------
- plugins: fix movieplayer-plugin

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

------------------
This commit was generated by Migit
2016-01-24 21:28:37 +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
Michael Liebmann
b0ca9a30cd CLuaInstMisc: Add getTimeOfDay() script function
- Set Lua api version to 1.39


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



------------------
This commit was generated by Migit
2016-01-21 17:42:07 +01:00
Michael Liebmann
2b49e84c77 CLuaInstance: Add some CComponentsHeader functions
- Set Lua api version to 1.38


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a61c3bfcd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-21 (Thu, 21 Jan 2016)



------------------
This commit was generated by Migit
2016-01-21 17:42:07 +01:00
vanhofen
2793cfdc72 yWeb: remove hardcoded css from textareas
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2738f70f38
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-21 (Thu, 21 Jan 2016)

Origin message was:
------------------
- yWeb: remove hardcoded css from textareas

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

------------------
This commit was generated by Migit
2016-01-21 16:38:59 +01:00
vanhofen
1776a904b6 yWeb: add button to check status of remote control
Origin commit data
------------------
Branch: ni/coolstream
Commit: a2ba194597
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-21 (Thu, 21 Jan 2016)

Origin message was:
------------------
- yWeb: add button to check status of remote control

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

------------------
This commit was generated by Migit
2016-01-21 11:18:53 +01:00
vanhofen
9d53bab174 controlapi: add possibility to check status of remote control
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3553030bce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-21 (Thu, 21 Jan 2016)

Origin message was:
------------------
- controlapi: add possibility to check status of remote control

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

------------------
This commit was generated by Migit
2016-01-21 11:17:05 +01:00
Thilo Graf
a9aa78ca3e text screen save: try to rework screen save behavior for textbox objects
Screen save now always disabled by default and can be controlled
outside of relevant objects.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9d72b086a2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-21 (Thu, 21 Jan 2016)



------------------
This commit was generated by Migit
2016-01-21 11:00:38 +01:00
Thilo Graf
cd9ad09b83 cc_types: add missing item type to signalbar
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9775f1f43a
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-21 (Thu, 21 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-21 11:00:34 +01:00
Thilo Graf
730adcdfb0 CScreenSaver: fix possible render of clock over screen size
check position and size use only possible available screen size


Origin commit data
------------------
Branch: ni/coolstream
Commit: 387d96d2f5
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-21 (Thu, 21 Jan 2016)



------------------
This commit was generated by Migit
2016-01-21 11:00:29 +01:00
Thilo Graf
db6be29b3f CInfoViewer: use different modes with enums for virtual zap and number input mode
This should fix missing rounded corners in numbaur input mode too.

Thx defans for input !


Origin commit data
------------------
Branch: ni/coolstream
Commit: 98b73c0d09
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-12 (Tue, 12 Jan 2016)



------------------
This commit was generated by Migit
2016-01-21 11:00:24 +01:00
Thilo Graf
46948c2d27 CComponentsText: try to fix mismatching calculation of y pos inside form
Origin commit data
------------------
Branch: ni/coolstream
Commit: 60c9dc8432
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-11 (Mon, 11 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-21 11:00:19 +01:00
Thilo Graf
b10a1096c3 CCDraw: remove clean up after restored screen
It seems not always useful to clean up everything after hide().
For more control in some cases an separate clean up with
clearSavedScreen() should be more flexible.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b701c345fb
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-21 (Thu, 21 Jan 2016)



------------------
This commit was generated by Migit
2016-01-21 10:58:21 +01:00
Thilo Graf
4266468a06 CComponentsItem: remove clean up from kill()
It is not always useful to clean up everything with kill().
For more control in some cases an separate clean up should be better.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 695f845907
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-10 (Sun, 10 Jan 2016)



------------------
This commit was generated by Migit
2016-01-21 10:16:37 +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
vanhofen
e3dbb16059 infoviewer_bb: make showIcon_DD() public
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1a290fb0cc
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-21 (Thu, 21 Jan 2016)

Origin message was:
------------------
- infoviewer_bb: make showIcon_DD() public

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

------------------
This commit was generated by Migit
2016-01-21 08:24:21 +01:00
Michael Liebmann
04ee890749 neutrino.cpp: Enable mute icon in channellist when 'Quickzap in list' active or allow
Partial revert commit fc2fd28825


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a2b1e26da
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-20 (Wed, 20 Jan 2016)

Origin message was:
------------------
neutrino.cpp: Enable mute icon in channellist when 'Quickzap in list' active or allow

 Partial revert commit fc2fd28825


------------------
This commit was generated by Migit
2016-01-20 22:51:19 +01:00
vanhofen
fd0317a21a rc_lock: rework class; switch to singleton; add icon; vfd-support
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2eb0aed5db
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-20 (Wed, 20 Jan 2016)

Origin message was:
------------------
- rc_lock: rework class; switch to singleton; add icon; vfd-support

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

------------------
This commit was generated by Migit
2016-01-20 20:26:52 +01:00
Thilo Graf
909e0484d4 CMovieBrowser:try to fix cover position and ratio for custom covers
TODO: 4:3 screenshot are still broken
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7783ee684f
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-19 (Tue, 19 Jan 2016)



------------------
This commit was generated by Migit
2016-01-19 15:33:05 +01:00
Thilo Graf
e7ba1ac2b6 CComponentsPicture: fix missing dimension values on wrong image location
In some constellations we can't get dimensions from getIconSize(),
so it is useful to fall back to g_PicViewer->getSize().

Cache cleanup removed, can be done at runtime if required.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0c67739074
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-19 (Tue, 19 Jan 2016)



------------------
This commit was generated by Migit
2016-01-19 15:33:05 +01:00
Stefan Seyfried
1ff26df09f edit lua_api_version.h instead of autogenerating it
This will help those who do not use ccache :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 96d7401e08
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-01 (Fri, 01 Jan 2016)



------------------
This commit was generated by Migit
2016-01-19 08:28:43 +01:00
vanhofen
364954ef6b listhelpers: satisfy -Werror
Origin commit data
------------------
Branch: ni/coolstream
Commit: 299852d388
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-18 (Mon, 18 Jan 2016)

Origin message was:
------------------
- listhelpers: satisfy -Werror

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

------------------
This commit was generated by Migit
2016-01-18 13:43:46 +01:00
vanhofen
bfdb68d9ca Revert "rcinput/neutrino: avoid the use of EVT_TIMESET"
This reverts commit 00bf8a7e92.

In some cases keys are don't used immediately:
---
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
CVFD::ShowText: [14:14]
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
2 key: 0074 value 2, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
1 key: 0074 value 1, translate: 0074 -standby-
0 key: 0074 value 0, translate: 0074 -standby-
[/.../cst-next/src/neutrino.cpp:standbyMode:3615] OFF
CSAPI (POWER-CLK): new CPU frequency: 600000000Hz
CSAPI (VIDEO): Standby 1 -> 0
CSAPI (HDMI-CEC): Power Status: STANDBY -> ON
CSAPI (HDMI-CEC): Device free (Logical Address: 03)
CSAPI (HDMI-CEC): Power Status: ON
---


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



------------------
This commit was generated by Migit
2016-01-18 08:10:23 +01:00
Stefan Seyfried
e7ac1949d6 listbox: use CListHelpers
Origin commit data
------------------
Branch: ni/coolstream
Commit: cfeaf6fc6d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-16 (Sat, 16 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-18 08:10:16 +01:00
Stefan Seyfried
5385dcf9a5 timerlist: use CListHelpers
remove duplicated code and use CListHelpers::UpDownKey().
Some variable types had to be changed to avoid typecasts, as
a result (int) casts to foo.size() had to be added :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: ed7eaafbcb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-16 (Sat, 16 Jan 2016)



------------------
This commit was generated by Migit
2016-01-18 08:10:16 +01:00
Stefan Seyfried
56fec50f22 upnpbrowser: use CListHelpers::UpDownKey
Origin commit data
------------------
Branch: ni/coolstream
Commit: edf7d48e04
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-16 (Sat, 16 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-18 08:10:16 +01:00
Stefan Seyfried
c05d47f16d CListHelpers: allow UpDownKey with int type, too
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b87206099
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-16 (Sat, 16 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-18 08:10:16 +01:00
Stefan Seyfried
0a83f0a7ef eventlist: use CListHelpers::UpDownKey
Origin commit data
------------------
Branch: ni/coolstream
Commit: 99453de557
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-16 (Sat, 16 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-18 08:10:16 +01:00
Stefan Seyfried
c5e2efd0e1 use CListHelpers to remove duplicated code
CListHelpers::UpDownKey() allows to remove duplicated
code from channellist, bouquetlist and bouqueteditor.


Origin commit data
------------------
Branch: ni/coolstream
Commit: aec658ce2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-16 (Sat, 16 Jan 2016)



------------------
This commit was generated by Migit
2016-01-18 08:10:16 +01:00
Stefan Seyfried
283dc31b6f add CListHelpers class
this can be used to factor out duplicate code implementations
from all the various channel-, bouquet-, eventlists etc...


Origin commit data
------------------
Branch: ni/coolstream
Commit: ec4aa07e17
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-16 (Sat, 16 Jan 2016)



------------------
This commit was generated by Migit
2016-01-18 08:10:16 +01:00
Thilo Graf
f8bf3d4823 CMovieBrowser: fix paint of screenshots/covers while scroll in movie list
Some covers were painted for entries without available cover image.
Slot OnAfterRefresh() was not really a good point to paint,
OnAfterScrollPage() seems a better solution.


Origin commit data
------------------
Branch: ni/coolstream
Commit: bee36d29f6
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-17 (Sun, 17 Jan 2016)



------------------
This commit was generated by Migit
2016-01-17 23:37:31 +01:00
Thilo Graf
efa2c78985 CTextBox: add signal handler into scroll methodes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 35a08fc5dd
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-17 (Sun, 17 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-17 23:37:31 +01:00
Michael Liebmann
c1534ae6b7 Fix last commit
Origin commit data
------------------
Branch: ni/coolstream
Commit: b1f08a6012
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-17 (Sun, 17 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-17 15:46:00 +01:00
Michael Liebmann
7c29c4029e CLuaInstVideo: Add script function 'setInfoFunc()'...
...for displaying information in the movieplayer

 - Set Lua api version to 1.36


Origin commit data
------------------
Branch: ni/coolstream
Commit: 644ab18844
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-17 (Sun, 17 Jan 2016)



------------------
This commit was generated by Migit
2016-01-17 06:14:49 +01:00
Michael Liebmann
40e38a9a75 More replace __FILE__ with __file__
Origin commit data
------------------
Branch: ni/coolstream
Commit: c7b6026ac2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-17 (Sun, 17 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-17 06:14:49 +01:00
gixxpunk
33e0848e69 re-apply 717ed7e87c
Origin commit data
------------------
Branch: ni/coolstream
Commit: 43bf709669
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)

Origin message was:
------------------
- re-apply 717ed7e87c

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

------------------
This commit was generated by Migit
2016-01-16 15:25:30 +01:00
gixxpunk
2c3370e9f3 jsoncpp: update to 0.10.5
Origin commit data
------------------
Branch: ni/coolstream
Commit: d74d85d1db
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)

Origin message was:
------------------
- jsoncpp: update to 0.10.5

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

------------------
This commit was generated by Migit
2016-01-16 15:25:30 +01:00
Michael Liebmann
db4ec25e60 CScreenSaver: Fix compile when pip is disabled
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d58e43499
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-16 14:44:12 +01:00
defans
f805e428d6 osd-setup: enable/disable screensaver options by conditions
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8fceac0245
Author: defans <defans@bluepeercrew.us>
Date: 2016-01-16 (Sat, 16 Jan 2016)

Origin message was:
------------------
- osd-setup: enable/disable screensaver options by conditions

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

------------------
This commit was generated by Migit
2016-01-16 12:33:20 +01:00