Commit Graph

186 Commits

Author SHA1 Message Date
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
Jacek Jendrzej
017ba71872 eitd: add and move viasat to extra switch
Origin commit data
------------------
Branch: ni/coolstream
Commit: 06ab9d186b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-08-09 (Sun, 09 Aug 2015)


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

------------------
This commit was generated by Migit
2015-08-09 17:54:31 +02:00
Jacek Jendrzej
2eee2dfdf9 src/gui/eventlist.cpp -add fsk filter to epg-search
Origin commit data
------------------
Branch: ni/coolstream
Commit: 81049d89cd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-07-01 (Wed, 01 Jul 2015)


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

------------------
This commit was generated by Migit
2015-07-01 21:39:20 +02:00
Jacek Jendrzej
a222035ec7 src/gui/eventlist.cpp-add program category filter to epg-search
Origin commit data
------------------
Branch: ni/coolstream
Commit: 39796eda68
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-06-30 (Tue, 30 Jun 2015)


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

------------------
This commit was generated by Migit
2015-06-30 14:23:39 +02:00
[CST] Focus
c20e245010 eitd/sectionsd.cpp: fix ntp_system_cmd when config updated from GUI
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5611d65c66
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-05 (Fri, 05 Jun 2015)


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

------------------
This commit was generated by Migit
2015-06-05 17:13:43 +03:00
[CST] Focus
2e946acc17 eitd/sectionsd.cpp: fix ntp_system_cmd in case ntpdate not found
Origin commit data
------------------
Branch: ni/coolstream
Commit: b91347e99a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-05 (Fri, 05 Jun 2015)


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

------------------
This commit was generated by Migit
2015-06-05 16:26:42 +03:00
[CST] Focus
fc163efa6d eitd/sectionsd.cpp: remove useless IS_WEBTV check on event channel id
Origin commit data
------------------
Branch: ni/coolstream
Commit: b230f63d85
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-01 (Mon, 01 Jun 2015)


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

------------------
This commit was generated by Migit
2015-06-02 12:26:44 +03:00
TangoCash
f9a3232d90 add VIASAT EPG based on martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb81369965
Author: TangoCash <eric@loxat.de>
Date: 2015-05-13 (Wed, 13 May 2015)


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

------------------
This commit was generated by Migit
2015-05-15 03:46:50 +02:00
Thilo Graf
9cef95a3af CTimeThread: sectionsd.cpp: use thread save localtime_r
Origin commit data
------------------
Branch: ni/coolstream
Commit: 76ca33de9f
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-01-12 (Mon, 12 Jan 2015)


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

------------------
This commit was generated by Migit
2015-03-29 22:40:04 +02:00
Thilo Graf
cd4c71fb48 CEitManager: use unified binary search for ntp
Origin commit data
------------------
Branch: ni/coolstream
Commit: d58679f42d
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-12-08 (Mon, 08 Dec 2014)


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

------------------
This commit was generated by Migit
2015-03-29 22:40:00 +02:00
Jacek Jendrzej
c7e089c9ac chhecking if epgdir directory exists for frequently save
Origin commit data
------------------
Branch: ni/coolstream
Commit: 22399f73e2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-03-24 (Tue, 24 Mar 2015)


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

------------------
This commit was generated by Migit
2015-03-24 21:00:44 +01:00
Stefan Seyfried
022bcb2f08 set threadnames to unique values
Origin commit data
------------------
Branch: ni/coolstream
Commit: fca14b17c5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-28 (Sat, 28 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-28 10:53:18 +01:00
Stefan Seyfried
08b0ae5997 sectionsd: disable debug messages
Origin commit data
------------------
Branch: ni/coolstream
Commit: fd666960c1
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:47:41 +01:00
Stefan Seyfried
57bfec8e12 sectionsd: silence debug output
Origin commit data
------------------
Branch: ni/coolstream
Commit: 884f43b948
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 12:54:57 +01:00
Stefan Seyfried
e4e9fb1e46 Merge remote-tracking branch 'test/cst-next'
Conflicts:
	src/gui/osdlang_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 48fdfc5e5e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-19 (Thu, 19 Feb 2015)



------------------
This commit was generated by Migit
2015-02-19 14:10:26 +01:00
[CST] Focus
db494a03a3 eitd: ignore neutrino epg filter, if filter was configured from xml
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d9e7a814d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-02-15 (Sun, 15 Feb 2015)


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

------------------
This commit was generated by Migit
2015-02-15 12:57:29 +03:00
Stefan Seyfried
31c7317205 Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/gui/epgview.cpp


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



------------------
This commit was generated by Migit
2015-02-07 23:12:01 +01:00
[CST] Focus
b492148034 eitd: as long as neutrino using only first content classification,
reduce content classification caching (leaving old code with ifdef)


Origin commit data
------------------
Branch: ni/coolstream
Commit: e8700de2b7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-30 (Fri, 30 Jan 2015)



------------------
This commit was generated by Migit
2015-01-30 19:47:30 +03: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
[CST] Focus
7a01f2ae7d eitd: add API to configure white EPG filter
Origin commit data
------------------
Branch: ni/coolstream
Commit: 486d3692a6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-22 (Thu, 22 Jan 2015)


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

------------------
This commit was generated by Migit
2015-01-22 18:58:53 +03:00
[CST] Focus
389d6fc968 eitd/sectionsd.cpp: bugfix after 8f5d75fe04:
neutrino do set current channel to 0 in standby, too


Origin commit data
------------------
Branch: ni/coolstream
Commit: d0593a5572
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-08 (Thu, 08 Jan 2015)



------------------
This commit was generated by Migit
2015-01-08 16:17:41 +03:00
[CST] Focus
8f5d75fe04 eitd/sectionsd.cpp: do not wakeup epg scan on service stop
Origin commit data
------------------
Branch: ni/coolstream
Commit: ad9bf009da
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-05 (Mon, 05 Jan 2015)


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

------------------
This commit was generated by Migit
2015-01-05 13:52:40 +03:00
Jacek Jendrzej
85c00e412d eitd: use check empty() instead of size() or length()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8e4af0b619
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-01 (Thu, 01 Jan 2015)


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

------------------
This commit was generated by Migit
2015-01-01 19:02:41 +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
[CST] Focus
75771422c9 eitd/sectionsd.cpp: try to fix filter restart on service stop
Origin commit data
------------------
Branch: ni/coolstream
Commit: f816efadc6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-12-23 (Tue, 23 Dec 2014)


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

------------------
This commit was generated by Migit
2014-12-23 19:08:01 +03:00
[CST] Focus
2e3f9cd4c5 eitd/sectionsd.cpp: fix busywait loop after service stop
Origin commit data
------------------
Branch: ni/coolstream
Commit: c4a8d40853
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-12-05 (Fri, 05 Dec 2014)


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

------------------
This commit was generated by Migit
2014-12-05 14:44:48 +03:00
vanhofen
2ae96ef599 add epg_save_frequently feature ...
... to provide the EPG data in frequently intervals on an external device


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

Origin message was:
------------------
- add epg_save_frequently feature ...

... to provide the EPG data in frequently intervals on an external device


------------------
This commit was generated by Migit
2014-12-05 09:08:56 +01:00
[CST] Focus
f7c9ab84f6 gui/miscsettings_menu.cpp: fix settings sectionsd config
Origin commit data
------------------
Branch: ni/coolstream
Commit: 320c3b163c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-20 (Mon, 20 Oct 2014)


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

------------------
This commit was generated by Migit
2014-10-20 11:16:14 +04:00
martii
12fcc7c961 eitd: Reduce sectionsd memory requirements:
* Various EPG related strings (language- and country keys, audio descriptions) come with a pretty low variance. Cache them, and use an index instead of allocating redundant strings for each and every SIevent.
* Storing content classifications in native format instead of std::string removes quite some memory overhead, too.

This saves about 250 bytes of RAM for every event cached, resulting in a considerably reduced sectionsd memory footprint.

Conflicts:
	src/eitd/xmlutil.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0bcff8b930
Author: martii <m4rtii@gmx.de>
Date: 2014-09-14 (Sun, 14 Sep 2014)



------------------
This commit was generated by Migit
2014-09-15 10:16:30 +04:00
[CST] Focus
900ade3987 neutrino: stop EIT read before zap
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3513f9830a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-02 12:59:21 +04: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
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
Jacek Jendrzej
35406e381c eitd/sectionsd.cpp void addEven: crash fix, do not use iterator without locking
Origin commit data
------------------
Branch: ni/coolstream
Commit: f1028f0d16
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-04-09 (Wed, 09 Apr 2014)


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

------------------
This commit was generated by Migit
2014-04-09 16:57:56 +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
[CST] Focus
920ee0fdf2 eitd/sectionsd.cpp: check myCurrentEvent for expire before using it
Origin commit data
------------------
Branch: ni/coolstream
Commit: 201022450c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-05 (Wed, 05 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-05 14:02:46 +04:00
Stefan Seyfried
9c7209e623 sectionsd: don't hardcode ntpdate and ntpd path
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1acddb37bf
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 21:43:52 +01:00
Stefan Seyfried
404006e379 sectionsd: don't hardcode ntpdate and ntpd path
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ded47c5c8
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 21:06:40 +01:00
Stefan Seyfried
784fabca91 sectionsd: set time at start, even if diff is <120s
Origin commit data
------------------
Branch: ni/coolstream
Commit: 17ba068850
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-26 13:37:28 +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
Stefan Seyfried
a2071caca6 sectionsd: set time at start, even if diff is <120s
Origin commit data
------------------
Branch: ni/coolstream
Commit: 97fef4e52b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-22 11:20:25 +01:00
[CST] Focus
c88bfe2818 eitd/sectionsd.cpp: try to fix messaging_zap_detected flag
Origin commit data
------------------
Branch: ni/coolstream
Commit: c57f0385c6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-21 (Sat, 21 Dec 2013)


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

------------------
This commit was generated by Migit
2013-12-21 14:03:35 +04:00
[CST] Focus
cc79d8a491 eitd/sectionsd.cpp: remove old events also when not scanning,
ie in standby, every 1 hour


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5acfcb9dee
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-19 (Thu, 19 Dec 2013)



------------------
This commit was generated by Migit
2013-12-20 16:43:37 +04:00
Stefan Seyfried
9ac6526107 sectionsd: work around buggy cDemux in libcoolstream
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bb5d1bdc0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-09 (Sat, 09 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-09 17:02:44 +01: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
[CST] Focus
b0c9fba66a eitd/sectionsd.cpp: do not send EVT_EIT_COMPLETE, if scanning paused
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a831b87a0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-10 (Thu, 10 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-10 19:01:46 +04:00
Jacek Jendrzej
5d8ebfab6e eitd: -fix wakeup epg scan with max_events==0
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6321bd1810
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-10-02 (Wed, 02 Oct 2013)


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

------------------
This commit was generated by Migit
2013-10-02 17:50:49 +02:00
[CST] Focus
103b9ffc0b eitd/sectionsd.cpp: add getEventsCount()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 537a60fe6b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-27 (Fri, 27 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-27 16:27:21 +04: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
[CST] Focus
f443e20c0f eitd/sectionsd.cpp: disable ntpd daemonize
Origin commit data
------------------
Branch: ni/coolstream
Commit: db027d50ea
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-08 (Thu, 08 Aug 2013)


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

------------------
This commit was generated by Migit
2013-08-08 10:57:18 +04:00