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
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
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
e9b3a3625b
lib/sectionsdclient: add EVT_EIT_COMPLETE event,
...
add demux number to setServiceChanged()
Origin commit data
------------------
Commit: 5ed5b6d200
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-06-12 (Wed, 12 Jun 2013)
2013-06-12 18:46:33 +04:00
Stefan Seyfried
b45f4b0dba
sectionsdclient: correctly initialize CurrentNextInfo with c'tor
...
Origin commit data
------------------
Commit: 9dc4b03248
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2012-10-31 (Wed, 31 Oct 2012)
2012-10-31 22:58:58 +01:00
[CST] Focus
8549fc8e32
lib/sectionsdclient/sectionsdclient.cpp,h: comment unused
...
Origin commit data
------------------
Commit: 6eaa28449b
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2012-08-30 (Thu, 30 Aug 2012)
2012-08-30 15:55:32 +04:00
Jacek Jendrzej
55216499fa
fix gcc 4.7.x warnings
...
Origin commit data
------------------
Commit: df2ab71978
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2012-07-09 (Mon, 09 Jul 2012)
2012-07-09 09:26:37 +02:00
[CST] Focus
a0c0d3d213
eitd/sectionsdclient: remove unused commands
...
Origin commit data
------------------
Commit: faacdd32df
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2012-02-03 (Fri, 03 Feb 2012)
2012-02-03 16:48:30 +04:00
Stefan Seyfried
e4f666d2f8
sectionsd: add table ID to event data
...
record the originating table ID with every event
if not set (e.g. for events read from saved data), it defaults
to 0xff to make sure it is bigger than a real existing table ID
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1381 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 72149b63a4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2011-04-09 (Sat, 09 Apr 2011)
2011-04-09 16:35:14 +00:00
Jacek Jendrzej
e0eb0195a8
fix set timer in findEvents
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@946 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: d8489c3abc
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2010-12-18 (Sat, 18 Dec 2010)
Origin message was:
------------------
-fix set timer in findEvents
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@946 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-12-18 19:11:12 +00:00
Jacek Jendrzej
9819856e7d
change 'long long' tom int64_t'; change variable buf to new delete;
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@291 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 8f59cc96ec
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2010-02-07 (Sun, 07 Feb 2010)
2010-02-07 14:32:21 +00:00
Stefan Seyfried
4e814f593e
compiler warning fixes
...
Fix a bunch of "warning: type qualifiers ignored on function
return type" (you see them with -Wall -Wextra). Still lots to fix.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@103 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 7b87012631
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2009-12-21 (Mon, 21 Dec 2009)
2009-12-21 00:00:02 +00:00
mrcolor
cb8dd3394d
our current experimental Neutrino branch
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)
2009-12-08 11:05:11 +00:00