mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,456 Commits 2 Branches 9 Tags
7b9f11df7ebf5c3cdd7a150526163fdda5d3e9af
Commit Graph

172 Commits

Author SHA1 Message Date
Stefan Seyfried
7b9f11df7e Merge remote-tracking branch 'test/cst-next' 
Conflicts:
	src/gui/osdlang_setup.cpp


Origin commit data
------------------
Commit: 48fdfc5e5e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-19 (Thu, 19 Feb 2015)
 2015-02-19 14:10:26 +01:00
[CST] Focus
22210b9fdc eitd: ignore neutrino epg filter, if filter was configured from xml 
Origin commit data
------------------
Commit: 5d9e7a814d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-02-15 (Sun, 15 Feb 2015)
 2015-02-15 12:57:29 +03:00
Stefan Seyfried
30eb1a1ced Merge remote-tracking branch 'check/cst-next' 
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: 66adad0811
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)
 2015-02-07 23:12:01 +01:00
[CST] Focus
96c523a0c2 eitd: as long as neutrino using only first content classification, 
reduce content classification caching (leaving old code with ifdef)


Origin commit data
------------------
Commit: e8700de2b7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-30 (Fri, 30 Jan 2015)
 2015-01-30 19:47:30 +03:00
Stefan Seyfried
a968a12b8d 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
------------------
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)
 2015-01-26 17:26:26 +01:00
[CST] Focus
0032c56bac eitd: add API to configure white EPG filter 
Origin commit data
------------------
Commit: 486d3692a6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-22 (Thu, 22 Jan 2015)
 2015-01-22 18:58:53 +03:00
[CST] Focus
a75181470c eitd/sectionsd.cpp: bugfix after bb10dced7e: 
neutrino do set current channel to 0 in standby, too


Origin commit data
------------------
Commit: d0593a5572
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-08 (Thu, 08 Jan 2015)
 2015-01-08 16:17:41 +03:00
[CST] Focus
bb10dced7e eitd/sectionsd.cpp: do not wakeup epg scan on service stop 
Origin commit data
------------------
Commit: ad9bf009da
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-05 (Mon, 05 Jan 2015)
 2015-01-05 13:52:40 +03:00
Jacek Jendrzej
ac5daf2dd9 eitd: use check empty() instead of size() or length() 
Origin commit data
------------------
Commit: 8e4af0b619
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-01 (Thu, 01 Jan 2015)
 2015-01-01 19:02:41 +01:00
Stefan Seyfried
d1e2143fd6 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
------------------
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)
 2014-12-28 12:32:12 +01:00
Stefan Seyfried
ec1a9fce17 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
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
 2014-12-25 18:03:08 +01:00
[CST] Focus
8f2687c0dd eitd/sectionsd.cpp: try to fix filter restart on service stop 
Origin commit data
------------------
Commit: f816efadc6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-12-23 (Tue, 23 Dec 2014)
 2014-12-23 19:08:01 +03:00
[CST] Focus
1706e2851c eitd/sectionsd.cpp: fix busywait loop after service stop 
Origin commit data
------------------
Commit: c4a8d40853
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-12-05 (Fri, 05 Dec 2014)
 2014-12-05 14:44:48 +03:00
vanhofen
b718defbe0 add epg_save_frequently feature ... 
... to provide the EPG data in frequently intervals on an external device


Origin commit data
------------------
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
 2014-12-05 09:08:56 +01:00
[CST] Focus
9f8752b2be gui/miscsettings_menu.cpp: fix settings sectionsd config 
Origin commit data
------------------
Commit: 320c3b163c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-20 (Mon, 20 Oct 2014)
 2014-10-20 11:16:14 +04:00
martii
0973d86ff9 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
------------------
Commit: 0bcff8b930
Author: martii <m4rtii@gmx.de>
Date: 2014-09-14 (Sun, 14 Sep 2014)
 2014-09-15 10:16:30 +04:00
[CST] Focus
3738250243 neutrino: stop EIT read before zap 
Origin commit data
------------------
Commit: 3513f9830a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
 2014-09-02 12:59:21 +04:00
[CST] Focus
8f7f3f9e4d webtv channels integration port, 
initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)
 2014-08-27 17:32:26 +04:00
Stefan Seyfried
3f36062fe7 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
------------------
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-04-27 19:14:06 +02:00
Jacek Jendrzej
6da922cd1e eitd/sectionsd.cpp void addEven: crash fix, do not use iterator without locking 
Origin commit data
------------------
Commit: f1028f0d16
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-04-09 (Wed, 09 Apr 2014)
 2014-04-09 16:57:56 +02:00
Stefan Seyfried
d06c1d8ad6 Merge remote-tracking branch 'check/next-cc' 
...only build-tested, needs fixes


Origin commit data
------------------
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-15 (Sat, 15 Feb 2014)
 2014-02-15 20:22:07 +01:00
[CST] Focus
51d0de467b eitd/sectionsd.cpp: check myCurrentEvent for expire before using it 
Origin commit data
------------------
Commit: 201022450c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-05 (Wed, 05 Feb 2014)
 2014-02-05 14:02:46 +04:00
Stefan Seyfried
a41ceae107 sectionsd: don't hardcode ntpdate and ntpd path 
Origin commit data
------------------
Commit: 1acddb37bf
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-26 (Sun, 26 Jan 2014)
 2014-01-26 21:43:52 +01:00
Stefan Seyfried
3a4094961f sectionsd: don't hardcode ntpdate and ntpd path 
Origin commit data
------------------
Commit: 1ded47c5c8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-26 (Sun, 26 Jan 2014)
 2014-01-26 21:06:40 +01:00
Stefan Seyfried
d44cb83cf0 sectionsd: set time at start, even if diff is <120s 
Origin commit data
------------------
Commit: 17ba068850
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)
 2013-12-26 13:37:28 +01:00
Stefan Seyfried
8d876ff4ef Merge remote-tracking branch 'check/next-cc' 
untested, probably needs some buildfixing


Origin commit data
------------------
Commit: 7d87ce9c54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)
 2013-12-22 21:25:05 +01:00
Stefan Seyfried
aa0ce3cd24 sectionsd: set time at start, even if diff is <120s 
Origin commit data
------------------
Commit: 97fef4e52b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)
 2013-12-22 11:20:25 +01:00
[CST] Focus
97c78b8f47 eitd/sectionsd.cpp: try to fix messaging_zap_detected flag 
Origin commit data
------------------
Commit: c57f0385c6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-21 (Sat, 21 Dec 2013)
 2013-12-21 14:03:35 +04:00
[CST] Focus
04de0be993 eitd/sectionsd.cpp: remove old events also when not scanning, 
ie in standby, every 1 hour


Origin commit data
------------------
Commit: 5acfcb9dee
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-19 (Thu, 19 Dec 2013)
 2013-12-20 16:43:37 +04:00
Stefan Seyfried
6661750313 sectionsd: work around buggy cDemux in libcoolstream 
Origin commit data
------------------
Commit: 4bb5d1bdc0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-09 (Sat, 09 Nov 2013)
 2013-11-09 17:02:44 +01:00
Stefan Seyfried
e6cbfe61bc 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
------------------
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
 2013-10-21 22:58:55 +02:00
[CST] Focus
8f7b944b3b eitd/sectionsd.cpp: do not send EVT_EIT_COMPLETE, if scanning paused 
Origin commit data
------------------
Commit: 0a831b87a0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-10 (Thu, 10 Oct 2013)
 2013-10-10 19:01:46 +04:00
Jacek Jendrzej
53db7cd6f0 eitd: -fix wakeup epg scan with max_events==0 
Origin commit data
------------------
Commit: 6321bd1810
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-10-02 (Wed, 02 Oct 2013)
 2013-10-02 17:50:49 +02:00
[CST] Focus
5ae7bcf60c eitd/sectionsd.cpp: add getEventsCount() 
Origin commit data
------------------
Commit: 537a60fe6b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-27 (Fri, 27 Sep 2013)
 2013-09-27 16:27:21 +04:00
Stefan Seyfried
2c76238007 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
------------------
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)
 2013-09-01 19:46:10 +02:00
[CST] Focus
558fb6b242 eitd/sectionsd.cpp: disable ntpd daemonize 
Origin commit data
------------------
Commit: db027d50ea
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-08 (Thu, 08 Aug 2013)
 2013-08-08 10:57:18 +04:00
[CST] Focus
4f3060bea4 eitd/sectionsd.cpp: check is /sbin/ntpdate present, use ntpd if not 
Origin commit data
------------------
Commit: 28af6c810b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-07 (Wed, 07 Aug 2013)
 2013-08-07 17:47:28 +04:00
Stefan Seyfried
fce4dbbe72 Merge branch 'check/next-cc' 
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)
 2013-06-16 21:22:14 +02:00
[CST] Focus
17d0b748a2 eitd/sectionsd.cpp: wakeup threadEIT only, if case demux number is not 0 (live) 
and cached events count less than max;
set full channel_id as current service for threadEIT


Origin commit data
------------------
Commit: 450099e04d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)
 2013-06-12 18:46:34 +04:00
Jacek Jendrzej
e076ac5d54 CEitManager::getEventsServiceKey - simplification - THX Gaucho316 
Origin commit data
------------------
Commit: 09bd2c98e9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-06-03 (Mon, 03 Jun 2013)
 2013-06-03 21:37:47 +02:00
Stefan Seyfried
2bf1ef37d0 sectionsd: don't hardcode ntpdate location 
Origin commit data
------------------
Commit: f5956f055d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-01 (Sat, 01 Jun 2013)
 2013-06-01 15:49:26 +02:00
Jacek Jendrzej
37887d1a8c eitd: addEvent - fix possible segfault if lastEvent==NULL 
Origin commit data
------------------
Commit: 1a1be2a82f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-26 (Sun, 26 May 2013)
 2013-05-26 18:44:52 +02:00
Stefan Seyfried
b6e65d0300 Merge remote-tracking branch 'check/next-cc' 
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)
 2013-05-24 20:24:39 +02:00
Jacek Jendrzej
23de0a12b5 CNeutrinoEventList::findEvents - add search all epg option 
Origin commit data
------------------
Commit: 35bac1ff40
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-17 (Fri, 17 May 2013)
 2013-05-17 21:08:09 +02:00
Jacek Jendrzej
1c4b455438 CNeutrinoEventList::findEvents - speedup search in all channelList 
Origin commit data
------------------
Commit: 63bb0996da
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-15 (Wed, 15 May 2013)
 2013-05-15 14:39:09 +02:00
Stefan Seyfried
f6c0718366 Merge remote-tracking branch 'check/next-cc' 
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)
 2013-05-10 10:06:47 +02:00
Stefan Seyfried
4563a6c7f5 sectionsd: fix memleak with unused events 
Origin commit data
------------------
Commit: b1e0fcb0c8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
 2013-04-17 10:21:33 +04:00
Stefan Seyfried
bd245e45f6 sectionsd: fix memleak with unused events 
Origin commit data
------------------
Commit: 3ea3f17460
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
 2013-04-14 12:56:42 +02:00
Stefan Seyfried
d3531638eb neutrino: fix most hardcoded paths 
Origin commit data
------------------
Commit: ffd4daea7c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
 2013-03-10 02:01:52 +01:00
[CST] Focus
a3aba8fba3 Merge branch 'next' of coolstreamtech.de:cst-public-gui-neutrino into next 
Conflicts:
	lib/libconfigfile/configfile.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: aa60c85768
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-07 (Thu, 07 Mar 2013)
 2013-03-07 17:10:57 +04:00