Commit Graph

551 Commits

Author SHA1 Message Date
Stefan Seyfried
499659677f Merge remote-tracking branch 'test/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 92fcc879b4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-03-07 (Sat, 07 Mar 2015)


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

------------------
This commit was generated by Migit
2015-03-07 20:09:44 +01:00
[CST] Focus
6f4e297c7b gui/infoviewer.cpp: enable clock background paint
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6f03505db
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-03-06 (Fri, 06 Mar 2015)


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

------------------
This commit was generated by Migit
2015-03-06 14:14:00 +03:00
Stefan Seyfried
d7c06500fc infoviewer: disable debug output
Origin commit data
------------------
Branch: ni/coolstream
Commit: b96b40a034
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-22 (Sun, 22 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-22 00:53:29 +01:00
Stefan Seyfried
0877747c6c infoviewer: simplify clock handling
Origin commit data
------------------
Branch: ni/coolstream
Commit: b74cf816cb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-21 (Sat, 21 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-21 13:02:40 +01:00
Stefan Seyfried
43f4d834ed infoviewer: use forward declaration instead of including infoviewer_bb
Origin commit data
------------------
Branch: ni/coolstream
Commit: 967f85eb5f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-14 14:31:11 +01:00
Stefan Seyfried
c92c77f7f4 infoviewer: use forward declaration instead of including infoviewer_bb
Origin commit data
------------------
Branch: ni/coolstream
Commit: ce5084ea52
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-10 15:38:21 +01:00
Stefan Seyfried
2263c8bd2e Merge remote-tracking branch 'check/cst-next'
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)



------------------
This commit was generated by Migit
2015-01-26 17:26:26 +01:00
vanhofen
c95df859ed infoviewer: align clock bottom to get same pos as channelname
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4810576268
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-30 (Tue, 30 Dec 2014)

Origin message was:
------------------
- infoviewer: align clock bottom to get same pos as channelname

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

------------------
This commit was generated by Migit
2014-12-30 00:22:21 +01:00
Stefan Seyfried
770e405c50 Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


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



------------------
This commit was generated by Migit
2014-12-28 12:32:12 +01:00
Stefan Seyfried
c8e3ec41a9 Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)



------------------
This commit was generated by Migit
2014-12-25 18:03:08 +01:00
Thilo Graf
b9977c2382 CInfoViewer: rework init and paint of clock
This removes some dimension assignments in start() because of
already existant and usable dimension values that comes directly
from clock object.


Origin commit data
------------------
Branch: ni/coolstream
Commit: a58bd6c235
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-12-19 (Fri, 19 Dec 2014)



------------------
This commit was generated by Migit
2014-12-19 10:19:51 +01:00
vanhofen
82b10410af infoviewer: fix calculation for time_width ...
... because some fonts has larger ' ' than ':'.
* align clock with 10 px right offset (same as the other elements)
* align depending elements with new clock dimensions


Origin commit data
------------------
Branch: ni/coolstream
Commit: 25f30a6fa4
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-18 (Thu, 18 Dec 2014)

Origin message was:
------------------
- infoviewer: fix calculation for time_width ...

 ... because some fonts has larger ' ' than ':'.
* align clock with 10 px right offset (same as the other elements)
* align depending elements with new clock dimensions


------------------
This commit was generated by Migit
2014-12-18 15:59:07 +01:00
[CST] Bas
683e1c9095 neutrino: add support for CST new simple frontpanel with LED segment display. (c) focus and adjusted by me.
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/channellist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f3872b5dd
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)



------------------
This commit was generated by Migit
2014-10-22 16:14:05 +04:00
[CST] Focus
0824918f69 gui/movieplayer.cpp: add support for marked file list to play (file playback) and repeat modes,
original code (C) martii <m4rtii@gmx.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: d83d519c86
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)



------------------
This commit was generated by Migit
2014-09-17 20:13:49 +04:00
martii
bca9371e65 system/settings: move theme colors to dedicated struct
Conflicts:
	src/driver/pictureviewer/pictureviewer.cpp
	src/gui/epgview.cpp
	src/gui/osd_setup.cpp
	src/gui/pluginlist.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b21cb152b5
Author: martii <m4rtii@gmx.de>
Date: 2014-01-06 (Mon, 06 Jan 2014)



------------------
This commit was generated by Migit
2014-09-12 18:29:21 +04:00
vanhofen
f3ed7e2a55 infoviewer: don't show sig/snr progressbars in webtv mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: f301912920
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-03 (Wed, 03 Sep 2014)

Origin message was:
------------------
- infoviewer: don't show sig/snr progressbars in webtv mode

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

------------------
This commit was generated by Migit
2014-09-03 15:23:29 +02:00
[CST] Focus
40dae113bc webtv channels integration port,
initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Branch: ni/coolstream
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)



------------------
This commit was generated by Migit
2014-08-27 17:32:26 +04:00
[CST] Bas
478c7fba32 split fec to fec/modulation/delivery system;
switch to new dvb-api headers;
improve dvb-t manual scan


Origin commit data
------------------
Branch: ni/coolstream
Commit: 17d1bbd12b
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)



------------------
This commit was generated by Migit
2014-08-27 17:14:33 +04:00
[CST] Focus
1613427042 merge neutrino-mp progressbar code, (C) martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: 416646bbff
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)


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

------------------
This commit was generated by Migit
2014-07-17 17:02:37 +04:00
Thilo Graf
5c7441f5d1 COSDFader: rename member functions, adapt implementations
Stop() is not exactly attributable if fader class used as inherited and
Fade() don't tell really what done and related to return value 'bool'...
especially as the fader class members have been not documented.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69e2debb02
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-05-30 (Fri, 30 May 2014)



------------------
This commit was generated by Migit
2014-06-23 18:43:47 +02:00
martii
c70e531529 gui/infoviewer: remove no longer used class member "old_timestr"
Origin commit data
------------------
Branch: ni/coolstream
Commit: e4801974be
Author: martii <m4rtii@gmx.de>
Date: 2014-06-19 (Thu, 19 Jun 2014)


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

------------------
This commit was generated by Migit
2014-06-20 14:35:22 +02:00
vanhofen
4f9e0ee544 change RenderString() default to UTF8
Origin commit data
------------------
Branch: ni/coolstream
Commit: 649d1b1f9d
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change RenderString() default to UTF8

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

------------------
This commit was generated by Migit
2014-06-11 23:07:13 +02:00
vanhofen
108a1c1b93 change getRenderWidth() default to UTF8
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b91cda918
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change getRenderWidth() default to UTF8

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

------------------
This commit was generated by Migit
2014-06-11 23:07:00 +02:00
vanhofen
35a12f9a02 infoviewer: only show remaining time if time is set
taken from martiis-neutrino-mp; based on code by seife;
contains an addition to 95bc39c627


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9d25727660
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-05-07 (Wed, 07 May 2014)



------------------
This commit was generated by Migit
2014-05-07 09:20:39 +02:00
martii
5c7d69daf1 gui/infoviewer: check for time being set
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff06822dd0
Author: martii <m4rtii@gmx.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)


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

------------------
This commit was generated by Migit
2014-05-07 09:20:00 +02:00
martii
3eb233b253 locale: rename in => word.in
Origin commit data
------------------
Branch: ni/coolstream
Commit: dff38fc6ee
Author: martii <m4rtii@gmx.de>
Date: 2014-05-06 (Tue, 06 May 2014)


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

------------------
This commit was generated by Migit
2014-05-06 12:31:32 +02:00
martii
09b398a09f gui/infoviewer, gui/eventlist: localization fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5fb5ea91bf
Author: martii <m4rtii@gmx.de>
Date: 2014-05-06 (Tue, 06 May 2014)


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

------------------
This commit was generated by Migit
2014-05-06 12:28:25 +02:00
martii
95bc39c627 gui/infoviewer: use localized value for minutes
Origin commit data
------------------
Branch: ni/coolstream
Commit: ab42e7f032
Author: martii <m4rtii@gmx.de>
Date: 2014-05-06 (Tue, 06 May 2014)


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

------------------
This commit was generated by Migit
2014-05-06 12:26:19 +02:00
Stefan Seyfried
59b887d87a Merge remote-tracking branch 'check/next-cc'
...only build-tested, needs fixes


Origin commit data
------------------
Branch: ni/coolstream
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-15 (Sat, 15 Feb 2014)



------------------
This commit was generated by Migit
2014-02-15 20:22:07 +01:00
Michael Liebmann
01c4403e57 CInfoViewer: Fix display progress bar with large fonts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0be3cb731d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-02-13 (Thu, 13 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-13 18:26:03 +01:00
[CST] Focus
c1f45572f8 gui/infoviewer.cpp: restore channel id in showMovieTitle(),
else infoviewer do not process some events after playback stop


Origin commit data
------------------
Branch: ni/coolstream
Commit: e8be660b09
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-04 (Tue, 04 Feb 2014)



------------------
This commit was generated by Migit
2014-02-04 17:42:42 +04:00
[CST] Focus
b3e8fb8ffb gui/infoviewer.cpp: update movieplayer position also in timeshift mode;
fix messages in timeshift mode: while infobar is visible, all but key events was dropped,
preventing ie record timer stop etc.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5135e30773
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-01-29 (Wed, 29 Jan 2014)



------------------
This commit was generated by Migit
2014-01-29 17:26:45 +04:00
Stefan Seyfried
b7c804fc22 Merge remote-tracking branch 'check/next-cc'
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp


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



------------------
This commit was generated by Migit
2014-01-23 14:08:37 +01:00
vanhofen
ae8cfd7dc2 adapt ShowHint handling from martii's neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6995e1a765
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)

Origin message was:
------------------
- adapt ShowHint handling from martii's neutrino-mp

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

------------------
This commit was generated by Migit
2014-01-22 12:11:52 +01:00
Stefan Seyfried
6fae9a0db4 Merge remote-tracking branch 'check/next-cc'
untested, probably needs some buildfixing


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



------------------
This commit was generated by Migit
2013-12-22 21:25:05 +01:00
Michael Liebmann
f28bf35c8a CInfoViewer: Not start clock thread
Origin commit data
------------------
Branch: ni/coolstream
Commit: 78bdef9c0a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-12-11 (Wed, 11 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-11 15:55:14 +01:00
Stefan Seyfried
2c48d93e05 Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5976f03ca2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-07 (Sat, 07 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-07 18:28:56 +01:00
vanhofen
970e5375c1 - infoviewer: use space instead of dot as seperator for clock
Origin commit data
------------------
Branch: ni/coolstream
Commit: ce7bad6e16
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-03 (Tue, 03 Dec 2013)

Origin message was:
------------------
 - infoviewer: use space instead of dot as seperator for clock

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

------------------
This commit was generated by Migit
2013-12-03 12:41:41 +01:00
Thilo Graf
a4b1d4dee6 CInfoViewer: use correct corners and text color for time display
Assigning of these properties are required after theme or color changes.


Origin commit data
------------------
Branch: ni/coolstream
Commit: fcb7b88ff0
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-12-01 (Sun, 01 Dec 2013)



------------------
This commit was generated by Migit
2013-12-01 22:37:43 +01:00
Stefan Seyfried
ea50f5f7bc Merge branch 'check/next-cc'
Only compile-tested.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5e736e81b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)



------------------
This commit was generated by Migit
2013-11-30 20:17:31 +01:00
Stefan Seyfried
2b6a033d8e Revert "Revert "global.h: Use forward-declarations to reduce number of dependencies""
This reverts commit 65cbab0307.

No Idea why this was reverted, so revert again :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: bf8ec4d89e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)



------------------
This commit was generated by Migit
2013-11-30 18:26:47 +01:00
martii
4d800a439d remove widest_number definition and usage, add Font::getMaxDigitWidth() method instead
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 15b2b2ec05
Author: martii <m4rtii@gmx.de>
Date: 2013-11-29 (Fri, 29 Nov 2013)



------------------
This commit was generated by Migit
2013-11-29 23:02:50 +01:00
Thilo Graf
862a1e7fec CInfoViewer: add missing color type for time display
On changed theme colors, it's required to set the current color values
otherwise the old values remain, this does not look so good.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a2185c32e
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-29 (Fri, 29 Nov 2013)



------------------
This commit was generated by Migit
2013-11-29 10:08:19 +01:00
Michael Liebmann
e000305768 Adapting certain files to the changed font handling of info clock
Origin commit data
------------------
Branch: ni/coolstream
Commit: 90985f11d2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-26 (Tue, 26 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-28 16:07:48 +01:00
Thilo Graf
545699763c CInfoViewer: show time with CComponentsFrmClock object
This replaces old code that displayed time in infobar.


Origin commit data
------------------
Branch: ni/coolstream
Commit: ef374d7f8d
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-26 (Tue, 26 Nov 2013)



------------------
This commit was generated by Migit
2013-11-26 11:56:23 +01:00
martii
e02dcc8dae gui/infoviewer: disable infoclock if radiotext is active
Origin commit data
------------------
Branch: ni/coolstream
Commit: c83263d5cd
Author: martii <m4rtii@gmx.de>
Date: 2013-11-23 (Sat, 23 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-25 13:11:08 +01:00
vanhofen
c195e50bd1 movieplayer: show channellogo in infobar
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ce5730f84
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-15 (Fri, 15 Nov 2013)

Origin message was:
------------------
- movieplayer: show channellogo in infobar

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

------------------
This commit was generated by Migit
2013-11-15 09:22:12 +01:00
vanhofen
65cbab0307 Revert "global.h: Use forward-declarations to reduce number of dependencies"
This reverts commit c266f96560.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c8d47fa49
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)



------------------
This commit was generated by Migit
2013-11-13 23:40:16 +01:00
Stefan Seyfried
c266f96560 global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bc6e43ad4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-13 10:40:03 +01:00
martii
f43b9f7e12 global.h: Use forward-declarations to reduce number of dependencies
[seife: amended to fix build]

Signed-off-by: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4eb66ba4b2
Author: martii <m4rtii@gmx.de>
Date: 2013-11-09 (Sat, 09 Nov 2013)



------------------
This commit was generated by Migit
2013-11-09 17:03:03 +01:00