Commit Graph

20 Commits

Author SHA1 Message Date
Stefan Seyfried
459f177cbb sectionsd: add hack to avoid bogus error messages on triple 2015-02-06 20:48:07 +01:00
Stefan Seyfried
3ed6033af9 get rid of dmx_td.h include, use dmx_hal.h instead 2015-02-06 20:16:50 +01:00
Stefan Seyfried
69c4dbbdba 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
2014-12-25 18:03:08 +01:00
[CST] Focus
3513f9830a neutrino: stop EIT read before zap 2014-09-02 12:59:21 +04:00
Stefan Seyfried
d5d5a60261 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
2013-06-16 21:22:14 +02:00
[CST] Focus
8bedb877dd eitd/dmx.cpp: delete demux instead of stop in closefd,
add helper to set demux number
2013-06-12 18:46:34 +04:00
Stefan Seyfried
ae1b98aa38 Merge branch 'uncool/dvbsi++' commit '6e0bc85a6c0'
This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp
2012-07-23 01:02:29 +02:00
[CST] Focus
42c96fe93c eitd: replace zapittypes.h to zapit/types.h 2012-04-10 15:29:59 +04:00
[CST] Focus
f4ba558155 eitd: little cleanup 2012-03-07 16:44:35 +04:00
[CST] Focus
95ec5d0f44 move MAX_SECTION_LENGTH to dmx.h 2012-03-02 19:28:13 +04:00
[CST] Focus
1930809471 eitd/dmx.cpp: change cache_section name to check_complete; add debug defines 2012-02-22 16:51:24 +04:00
[CST] Focus
2942a55854 eitd/dmx.cpp: comment request_pause/unpause;
move global myDMXOrderUniqueKey to DMX class;
remove wakeup from dropCachedSectionIDs;
add seen_section flag to prevent change filter on timeouts - until skipped loop or complete;
enable check complete for CN thread
2012-02-21 19:56:45 +04:00
[CST] Focus
4925620eec eitd/dmx.h: move get_eit_version, get_current_service to header;
change current_service type to t_channel_id
2012-02-18 15:46:28 +04:00
[CST] Focus
e5c8718955 eitd/dmx.cpp: experimental. check for complete totally changed 2012-02-17 20:10:56 +04:00
[CST] Focus
2a7908ae27 eitd/dmx.cpp: add next_filter() 2012-02-16 20:40:21 +04:00
[CST] Focus
5a0fce7700 eitd/dmx: remove unused pauselock; add default constructor 2012-02-10 20:16:19 +04:00
[CST] Focus
c68321c68a eitd DMX::getSection: change char* to uint8_t 2012-02-07 15:08:34 +04:00
[CST] Focus
54c12cbeff eitd dmx.h: remove read 2012-02-07 14:03:30 +04:00
[CST] Focus
de2140ec78 eitd: remove most of code under #if 0 2012-02-01 18:38:30 +04:00
[CST] Focus
1b4e149bd1 real copy of sectionsd includes 2012-02-01 16:57:05 +04:00