Commit Graph

38 Commits

Author SHA1 Message Date
max_10
1fa824cab3 - TRIPLEDRAGON: deleted
Conflicts:
	lib/libdvbsub/dvbsub.cpp
	src/system/flashtool.cpp
2020-10-04 16:48:01 +02:00
vanhofen
6fe5d269af - add hd51; mostly ported from TangoCash's neutrino-mp 2017-10-29 18:31:30 +01:00
svenhoefer
b12624d1fa Merge branch 'master' into pu/mp
Conflicts:
	src/gui/miscsettings_menu.cpp
	src/neutrino.cpp
	src/system/settings.h
2017-03-20 01:31:51 +01:00
svenhoefer
233886df8d - remove unused g_info.box_Type 2017-03-19 01:04:48 +01:00
Stefan Seyfried
9ed6cfe859 lcdd (tripledragon): remove bogus warning message 2017-02-14 00:17:03 +01:00
Stefan Seyfried
5188f721c4 set useful thread names for all spawned threads 2017-02-12 22:55:36 +01:00
Stefan Seyfried
b9da7f01bf set useful thread names for all spawned threads 2017-02-12 15:17:32 +01:00
Stefan Seyfried
e73d266c3e lcdd: remove useless cast 2015-02-14 14:31:11 +01:00
Stefan Seyfried
7fad56623f lcdd: remove useless cast 2015-02-10 14:44:23 +01:00
Stefan Seyfried
bbafc5c9ba lcdd/simple_display: adapt to new API 2015-01-26 17:27:58 +01:00
Stefan Seyfried
b5a64e6887 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
2015-01-26 17:26:26 +01:00
Jacek Jendrzej
8023a6317b neutrino use check empty() instead of length() or size() 2015-01-03 17:51:08 +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
svenhoefer
649d1b1f9d - change RenderString() default to UTF8 2014-06-11 23:07:13 +02:00
svenhoefer
8b91cda918 - change getRenderWidth() default to UTF8 2014-06-11 23:07:00 +02:00
Stefan Seyfried
b414474323 Merge remote-tracking branch 'check/next-cc'
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp
2014-01-23 14:08:37 +01:00
Stefan Seyfried
c33f5e4993 build fix for tripledragon after last merge 2013-12-22 21:27:03 +01:00
Stefan Seyfried
88e52bc563 lcdd: ignore Mode parameter in showPercentOver 2013-11-15 11:58:20 +01:00
Stefan Seyfried
769d310455 remove unneeded CConfigFile from lcdd and shutdown_count 2013-11-13 10:39:04 +01:00
Stefan Seyfried
f2791fa792 remove unneeded CConfigFile from lcdd and shutdown_count 2013-11-09 16:00:00 +01:00
Stefan Seyfried
cb3a84cbec lcdd: update icon names 2013-05-11 17:03:50 +02:00
Stefan Seyfried
44d1d8a808 lcdd: add proper destructor to kill time thread 2013-03-03 21:52:21 +01:00
Stefan Seyfried
be99a52526 tripledragon: small cosmetic LCD fixes 2012-11-10 13:56:17 +01: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
satbaby
bc574e9688 use empty() instead of size() 2012-06-16 09:44:42 +02:00
Stefan Seyfried
7a22a029d1 spark: improve time display in standby mode 2012-04-17 19:33:57 +02:00
Stefan Seyfried
fb6633b7aa neutrino: avoid float for percent calculations 2012-04-17 19:33:51 +02:00
seife
1bf6f26016 TD neutrino/lcdd: remove unnecessary includes
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2029 e54a6e83-5905-42d5-8d5c-058d10e6a962
2012-01-01 12:07:23 +00:00
seife
00843bd5e3 lcdd: add isUTF8() from edvbstring
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2028 e54a6e83-5905-42d5-8d5c-058d10e6a962
2012-01-01 11:57:20 +00:00
seife
b35a163e85 neutrino: improve TD LCD support in movieplayer
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2027 e54a6e83-5905-42d5-8d5c-058d10e6a962
2012-01-01 11:57:16 +00:00
seife
af296c6548 lcdd: fix compiler warnings on Tripledragon
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1827 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-11-05 12:09:56 +00:00
seife
42e167fda4 lcdd: set has_lcd = false to hide useless LCD settings menu
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1516 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-06-05 10:54:29 +00:00
seife
0a18280821 neutrino/lcdd: fix compile with gcc-4.5.2
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1515 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-06-05 10:54:26 +00:00
seife
0e331aec34 lcdd: initialize variable to silence valgrind
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1514 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-06-05 10:54:22 +00:00
seife
32a4ad2c0d lcdd: blink the date if recording during standby
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1513 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-06-05 10:54:19 +00:00
seife
30b37b3c1f neutrino: first (very) dirty hack to make TD LCD work
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1512 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-06-05 10:54:16 +00:00
satbaby
6615a15256 tiny fix (other platform
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1425 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-05-02 12:29:34 +00:00
seife
66dd0b0174 add lcd display code for Tripledragon, mostly from tuxbox
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@964 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-12-25 17:43:43 +00:00