Commit Graph

550 Commits

Author SHA1 Message Date
Thilo Graf
f2e15fbea7 CChannelList: ensure erase of clock after stopping
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a28d853d2
Author: Thilo Graf <dbt@novatux.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-22 20:38:21 +02:00
martii
facfe0d839 gui/channellist: use localized value for minutes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 00c1a8af01
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:21:07 +02:00
Stefan Seyfried
8df9ff12cc Merge remote-tracking branch 'check/next-cc'
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)



------------------
This commit was generated by Migit
2014-04-27 19:14:06 +02:00
Thilo Graf
0f2a203035 CComponentsPIP: use a default frame with thickness 2 and small corner radius
Origin commit data
------------------
Branch: ni/coolstream
Commit: a573b02b85
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-03-16 (Sun, 16 Mar 2014)


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

------------------
This commit was generated by Migit
2014-04-02 08:40:21 +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
2c93f6538a CComponentsFrmClock: Fix thread handling
- Set clock activ = false for default


Origin commit data
------------------
Branch: ni/coolstream
Commit: ddc826ab51
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-02-13 (Thu, 13 Feb 2014)



------------------
This commit was generated by Migit
2014-02-13 18:26:04 +01:00
Stefan Seyfried
de371a25e8 Merge remote-tracking branch 'check/next-cc-fixed'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 78f51baf66
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-26 (Sun, 26 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-26 00:33:08 +01:00
Thilo Graf
9585b49365 CComponentsHeader: rework constructors, add CComponentsHeaderLocalized
Member initVarHeader() now used with parameters, so it's possible
to remove multiple code in constructors, but some class must be
renamed to CComponentsHeaderLocalized.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ea7ec48df
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-18 (Sat, 18 Jan 2014)

Origin message was:
------------------
CComponentsHeader: rework constructors, add CComponentsHeaderLocalized

Member initVarHeader() now used with parameters, so it's possible
to remove multiple code in constructors, but some class must be
renamed to CComponentsHeaderLocalized.


------------------
This commit was generated by Migit
2014-01-24 23:09:56 +01: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
35830797d6 adapt ShowMsg handling from martii's neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 53f5801d6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)

Origin message was:
------------------
- adapt ShowMsg 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:37:21 +01:00
Stefan Seyfried
0c4ecc191a Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d379dcb30
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-29 (Sun, 29 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-29 22:12:09 +01:00
vanhofen
af18c89c3d channellist: channellogos can be disabled
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9fb63a20d9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-28 (Sat, 28 Dec 2013)

Origin message was:
------------------
- channellist: channellogos can be disabled

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

------------------
This commit was generated by Migit
2013-12-28 23:39:51 +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
7d7d97d84f CChannelList: Fix display header clock
Origin commit data
------------------
Branch: ni/coolstream
Commit: d591acff42
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-12-17 (Tue, 17 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-17 08:35:31 +01:00
Jacek Jendrzej
ffb3003ae1 CChannelList::~CChannelList(): delete remove unnecessary
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9ef0e68ba2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-12-16 (Mon, 16 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-16 13:39:55 +01:00
Jacek Jendrzej
9e4e5d7e94 CChannelList::~CChannelList(): fix possible segfault
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e2d12e5d5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-12-15 (Sun, 15 Dec 2013)



------------------
This commit was generated by Migit
2013-12-15 17:40:25 +01:00
Michael Liebmann
64622043f1 CComponentsFrmClock: Use blinking function for InfoClock & Channellist
Origin commit data
------------------
Branch: ni/coolstream
Commit: 713003aa84
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-12-10 (Tue, 10 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
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
[CST] Focus
426a32538f gui/channellist.cpp: fix empty box paint, if no logo found
Origin commit data
------------------
Branch: ni/coolstream
Commit: edaa65d51d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-28 (Thu, 28 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-29 17:27:10 +04:00
[CST] Focus
e69fc7a748 gui/channellist.cpp: disable screen save for detail line
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3b707458be
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-28 (Thu, 28 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-29 17:27:10 +04: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
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
52ff7cfcb9 Merge branch 'check/next-cc'
Only compile-tested.


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



------------------
This commit was generated by Migit
2013-11-13 14:04:15 +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
Stefan Seyfried
b0077cafc5 Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.


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



------------------
This commit was generated by Migit
2013-11-10 16:55:53 +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
Thilo Graf
f47146c6ea revert e813d9f32b
Was bad idea to rename. Other Classes can also inherit this. See CMenuTarget


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6dd1da0628
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-25 (Fri, 25 Oct 2013)



------------------
This commit was generated by Migit
2013-10-26 23:25:59 +02:00
Thilo Graf
e813d9f32b CComponents: rename hide() to hideCC()
There are too many name conflicts with hide-members in other classes.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6ee7fac1a5
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-24 (Thu, 24 Oct 2013)



------------------
This commit was generated by Migit
2013-10-24 21:39:04 +02:00
Thilo Graf
cbc2b193af CComponents: add unfied header file for general include of cc classes
Provides a unified header file, so it is not required to select a
certain header file.


Origin commit data
------------------
Branch: ni/coolstream
Commit: f7798affc6
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-24 (Thu, 24 Oct 2013)



------------------
This commit was generated by Migit
2013-10-24 21:19:07 +02:00
Thilo Graf
b6411824e2 CChannelList: set some clock item properties in dependency from header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9f150435a7
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-24 21:19:06 +02:00
Stefan Seyfried
971d575b78 Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)



------------------
This commit was generated by Migit
2013-10-21 22:58:55 +02:00
defans
da34f33c46 fix possible segfault in channallist
fix segfaut channallist in movieplayer mode with active minitv


Origin commit data
------------------
Branch: ni/coolstream
Commit: 88b92d3d90
Author: defans <defans@bluepeercrew.us>
Date: 2013-10-09 (Wed, 09 Oct 2013)



------------------
This commit was generated by Migit
2013-10-09 23:13:23 +02:00
Thilo Graf
ff3c833ddd CChannelList: fix color of inactive channel in bouquets on active quickzap mode
supplement to 468cdc0835
see also:
http://www.dbox2world.net/index.php?page=Thread&postID=157903#post157903


Origin commit data
------------------
Branch: ni/coolstream
Commit: f6d04bfbba
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-09 (Wed, 09 Oct 2013)



------------------
This commit was generated by Migit
2013-10-09 22:50:57 +02:00
Thilo Graf
c81c83ca50 CChannelList: style fixes
unititialize variables 'r_icon_w', 'p_event':
Variable 'r_icon_w' and Variable 'p_event' were reassigned with value
before the old one has been used.

Scope of the variable 'buf', 'cFrom', 'rec_mode', 'first' can be reduced.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 01fdbba7b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-06 (Sun, 06 Oct 2013)



------------------
This commit was generated by Migit
2013-10-09 22:50:57 +02:00
Thilo Graf
9ae59242a5 CChannelList: use matching data types for output
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3788a5a5ec
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-06 (Sun, 06 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-09 22:50:57 +02:00
Thilo Graf
32369f39da CChannelList: use CComponentsPIP object for minitv
It's working with unified other implementations of minitv e.g. imageinfo,
streaminfo and can provide better options for an
implementation with native pip. Possible variants will follow soon.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 30c7010c6b
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-02 (Wed, 02 Oct 2013)



------------------
This commit was generated by Migit
2013-10-02 10:21:11 +02:00
Stefan Seyfried
c4c20a0790 remove all fb->blit() calls
TODO: check if plugins etc. need extra treatment


Origin commit data
------------------
Branch: ni/coolstream
Commit: c68ffa2155
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-28 (Sat, 28 Sep 2013)



------------------
This commit was generated by Migit
2013-09-28 13:01:03 +02:00
[CST] Focus
c68d7a89ea gui/channellist.cpp: fix reset 'new' channel flag
Origin commit data
------------------
Branch: ni/coolstream
Commit: 173403120f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-26 (Thu, 26 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-26 19:46:25 +04:00
[CST] Focus
51e8702fab gui/channellist.cpp: add menu option to reset all 'new' channels
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d52885a5e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-25 (Wed, 25 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-25 17:08:34 +04:00
Christian Schuett
468cdc0835 CChannelList: mark current channel if not selected
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 32ca9b848c
Author: Christian Schuett <Gaucho316@hotmail.com>
Date: 2013-09-19 (Thu, 19 Sep 2013)



------------------
This commit was generated by Migit
2013-09-19 09:28:42 +02:00
Thilo Graf
6d90cc0a5c CComponents: remove member setCornerRadius(),
setCorner() replaces this function, 2nd parameter sets type


Origin commit data
------------------
Branch: ni/coolstream
Commit: 33ec56ad6f
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-09-15 (Sun, 15 Sep 2013)



------------------
This commit was generated by Migit
2013-09-19 08:24:40 +02:00
[CST] Focus
66c5c51b0e channel list: restrict adding channels to favorits only,
show empty bouquets only in channel add mode


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



------------------
This commit was generated by Migit
2013-09-18 12:57:56 +04:00
Jacek Jendrzej
d1889b0052 channellist: disable scale window size with miniTV
Origin commit data
------------------
Branch: ni/coolstream
Commit: be74a66d7b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-09-05 (Thu, 05 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-05 20:42:16 +02:00
[CST] Focus
a10c18d3e1 gui/channellist.cpp: disable show bouquet name on VFD
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0e72bf5905
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-03 (Tue, 03 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-03 18:23:20 +04:00
Stefan Seyfried
af252a3d89 Merge branch 'check/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 50977ef2f5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-03 (Tue, 03 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-03 09:36:49 +02:00
Michael Liebmann
20da0c47fa src/gui/channellist.cpp: Fix OSD (headerclock)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 83ee284269
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-02 (Mon, 02 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-02 23:50:12 +02:00
vanhofen
9906e3f32e channellist: disable miniTV in movieplayer-mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: ebd5f54753
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-09-02 (Mon, 02 Sep 2013)

Origin message was:
------------------
- channellist: disable miniTV in movieplayer-mode

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

------------------
This commit was generated by Migit
2013-09-02 22:37:07 +02:00
Stefan Seyfried
2dcc32acd2 Merge remote-tracking branch 'check/next-cc'
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)



------------------
This commit was generated by Migit
2013-09-01 19:46:10 +02:00