Commit Graph

593 Commits

Author SHA1 Message Date
Stefan Seyfried
593871bf0f configfile: set the modified flag correctly on set*Vector methods 2013-02-23 15:34:47 +01:00
[CST] Focus
81cf9c7afc libcoolstream2/dmx_cs.h: update header 2013-02-13 14:09:47 +04:00
[CST] Focus
ca3ac51881 lib/libcoolstream2: sync control headers 2013-01-18 16:53:40 +04:00
[CST] Focus
60b5c40d14 lib/libcoolstream2/video_cs.h: update apollo header 2013-01-16 16:35:38 +04:00
Stefan Seyfried
a5ed005ff8 neutrino: enable screenshots 2013-01-13 18:49:37 +01:00
Stefan Seyfried
dbf7f9719b tuxtxt: fix topmenu for small OSD borders 2013-01-13 17:36:41 +01:00
[CST] Focus
d3e2a2bdd0 add libcoolstream/cs_frontpanel.h copy 2013-01-11 15:14:12 +04:00
[CST] Focus
1db9531bdc Merge branch 'dvbsi++' into next 2013-01-11 14:21:44 +04:00
[CST] Focus
d3d2efe475 Makefiles.am: add conditional include for libcoolstream 2013-01-11 14:17:16 +04:00
[CST] Focus
94c7e6854c lib/libcoolstream: restore nevis headers 2013-01-11 14:00:49 +04:00
[CST] Focus
58c1650b72 lib/libcoolstream2: directory for apollo headers 2013-01-11 13:59:17 +04:00
[CST] Focus
f92d9e6e57 lib/libcoolstream: sync headers 2013-01-11 11:10:58 +04:00
[CST] Focus
311274b87c sync libcoolstream headers 2013-01-11 10:48:14 +04:00
[CST] Focus
6e41c65fad merge public git changes 2013-01-09 19:30:07 +04:00
Stefan Seyfried
09e0efb01e tuxtxt: fix width of topmenu box 2013-01-01 22:29:17 +01:00
Stefan Seyfried
acfd623d02 fix nevis_ir.h check and libcoolstream/hwcaps 2012-12-30 21:36:44 +01:00
Stefan Seyfried
f8f5467fdb Merge branch 'uncool/dvbsi++' commit 4965619a79
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
2012-12-30 21:35:20 +01:00
micha-bbg
b1138e16b0 * Fix include path for moved header files 2012-12-13 18:09:09 +01:00
svenhoefer
da716f865e Merge remote-tracking branch 'svn_CROSSENVIRONMENT_coolstream/master' into dvbsi++ 2012-12-13 10:50:49 +01:00
svenhoefer
998ae6d81d - svn_CROSSENVIRONMENT_coolstream: move files to new right place 2012-12-13 10:49:06 +01:00
[CST] Focus
5a3e41ff5d lib/libcoolstream/cnxtfb.h: header update 2012-12-12 11:33:14 +04:00
[CST] Bas
b018c08cce neutrino: add TANK video modes (we only support RGB / YPBPR on both cinch and scart at the same time). 2012-12-04 00:28:34 +08:00
[CST] Bas
b9478659dd neutrino: add data and updated cnxtfb.h. 2012-11-22 01:38:08 +08:00
[CST] Bas
1fa9244f91 neutrino: add new power manager header which adds destructor for cpu freq class. 2012-11-13 12:41:18 +08:00
Stefan Seyfried
1ae305953c hw_caps: fix compile on coolstream 2012-11-10 22:53:48 +01:00
Stefan Seyfried
475608c594 tuxtxt: fix build on generic pc, don't open framebuffer 2012-11-02 20:06:53 +01:00
Stefan Seyfried
af6881a53c tuxtxt: use neutrino rcinput 2012-11-02 19:11:38 +01:00
Stefan Seyfried
9dc4b03248 sectionsdclient: correctly initialize CurrentNextInfo with c'tor 2012-10-31 22:58:58 +01:00
Stefan Seyfried
5394321ea8 dvbsubtitle: free avcodec context in destructor 2012-10-31 22:57:51 +01:00
Stefan Seyfried
8e46250c7c suppress some basicclient valgrind warnings
To enable these paranoia memsets for testing, compile with
-DPEDANTIC_VALGRIND_SETUP. Probably more of not completely
initialized structs are present in other parts of the code.
This is probably not useful for productive builds.
2012-10-31 18:31:04 +01:00
Stefan Seyfried
1b5d92ca8a tuxtxt: fix direct access keys in menu 2012-10-31 15:40:40 +01:00
Stefan Seyfried
adb23b23ee Merge branch 'uncool/dvbsi++' commit 'dc95ffa37c6'
...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.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/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp
2012-10-14 12:51:07 +02:00
[CST] Bas
a222240dbb Merge branch 'neutrino-apollo' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Conflicts:
	src/timerd/timermanager.cpp
2012-09-26 17:52:47 +08:00
[CST] Focus
70836baa48 lib/libcoolstream/record_cs.h: update header 2012-09-25 17:13:43 +04:00
[CST] Bas
fbc512889f Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo 2012-09-24 15:28:48 +08:00
Stefan Seyfried
04ee2e87f3 neutrino: start to use hardware_caps
Use hardware_caps instead of cs_get_revision() and #ifdef HAVE_FOO_HW
to distinguish between different boxtypes.
2012-09-23 21:34:47 +02:00
[CST] Focus
9fdbdbd343 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++ 2012-09-13 11:24:13 +04:00
satbaby
a3bfab0bcd remove doubles include 2012-09-11 20:31:33 +02:00
[CST] Focus
70e8c5d13a Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++ 2012-09-10 15:25:20 +04:00
[CST] Bas
688f464bb6 Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo 2012-09-10 07:39:30 +08:00
svenhoefer
1e1a3265e6 - tuxtxt: fix creation of /var/tuxbox/config/tuxtxt/ 2012-09-05 23:42:10 +02:00
[CST] Focus
6eaa28449b lib/sectionsdclient/sectionsdclient.cpp,h: comment unused 2012-08-30 15:55:32 +04:00
[CST] Focus
a391bf3237 lib/sectionsdclient/sectionsdMsg.h: cleanup commands, comment unused 2012-08-30 15:54:49 +04:00
satbaby
9a889e1496 tuxtxt.h: remove unnecessary header 2012-08-21 14:06:18 +02:00
[CST] Focus
c5f4c53fb7 lib/libnet/libnet.c: fix unused variable warning 2012-08-04 14:14:08 +04:00
satbaby
9124c20f31 comment out never used 2012-08-04 10:03:19 +02:00
[CST] Focus
f8aa4262cb recording: testing support for multi-record of the same channel, new libs required 2012-08-03 20:00:04 +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
Stefan Seyfried
ad7c88379a tuxtxt: avoid spurious deadlocks on startup 2012-07-15 13:28:17 +02:00
Stefan Seyfried
cb36c6e712 tuxtxt: make sure that startpage is initialized
when enabling tuxtxt caching, saving settings and then
starting tuxtxt, the start page was not initialized
2012-07-15 13:23:52 +02:00