mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
3,544 Commits 1 Branch 51 Tags
7e23ac7223b9ded8d3fc8b63b07889a76c2e9158
Commit Graph

28 Commits

Author SHA1 Message Date
Stefan Seyfried
7e23ac7223 Merge branch 'uncool/dvbsi++' commit '7ea3a20a808' 
...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp
 2012-11-03 10:45:33 +01:00
satbaby
c2052784ec src/driver/vfd.cpp: -fix ioctl error on shutdown 2012-10-29 13:24:11 +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
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
a8ec81b53a vfd.cpp: add timer for show servicename time switch 2012-07-12 15:35:37 +02:00
satbaby
bc574e9688 use empty() instead of size() 2012-06-16 09:44:42 +02:00
[CST] Focus
d02b1c9042 driver/vfd.cpp: init mode variable in ctor 2012-05-02 17:47:04 +04:00
Stefan Seyfried
fb6633b7aa neutrino: avoid float for percent calculations 2012-04-17 19:33:51 +02:00
satbaby
3c29473e7f vfd: use wake_up instead of setMode for turn on LCD 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2009 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-27 19:29:17 +00:00
micha-bbg
8b8b89a129 *Fix LED/VFD indication in time shift (r1828) 
- Changes resulted to sometimes crash neutrino, this patch fixes it.


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1846 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-11-14 21:59:48 +00:00
micha-bbg
27690fb7a0 - Fix LED/VFD indication in time shift. 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1828 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-11-05 13:44:38 +00:00
seife
e16b75b53d CVFD: make ShowText() use const char* to avoid ugly casts 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1549 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-06-19 20:26:11 +00:00
satbaby
aac749a682 vfd: rework vfd menu (use ItemSlider), vfdcontroler deprecated 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1420 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-05-02 10:57:53 +00:00
satbaby
dae995437a trigger vfd time in standby 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1313 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-03-19 11:59:11 +00:00
satbaby
790ec8170c -add lcd menu option: show channalname or clock 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1237 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-03-02 14:14:50 +00:00
seife
98eb3b0774 CVFD: remove debug output 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1173 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-02-20 16:54:06 +00:00
satbaby
f049a627f3 LEDs ( blinke blinke ;) ) 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1150 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-02-11 11:51:15 +00:00
satbaby
d00ac262ae -add menu for led record 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1116 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-02-07 18:53:26 +00:00
focus
43d4d88e40 Testing pmt update while recording fix 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1095 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-01-30 14:00:26 +00:00
focus
ab0f7f731c - Remove some globals from vcrcontrol 
- Allow ttx/epg keys for timeshift
- Fix record+live streaming
- Live stream code changes for testing
- Changes to handle internal CA multi-decoding
- hack for -Werror compiling



git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1040 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-01-25 17:22:38 +00:00
satbaby
eb393f7857 compil fix 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@908 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-11-28 14:19:08 +00:00
focus
41234dbfb5 Testing VBI, new libcoolstream needed 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@796 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-09-23 15:44:11 +00:00
satbaby
c669bb863f led menu enlarge 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@726 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-08-19 12:10:01 +00:00
satbaby
d88dece038 -add led on/off menu 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@725 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-08-18 16:37:00 +00:00
satbaby
6a549a7290 -add deepStandby brightness menu for neo 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@724 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-08-17 16:36:21 +00:00
mws
474790557f fix initializers and shadows 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@124 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2009-12-29 13:56:52 +00:00
mws
1b13da2617 Mark unused vars as comment 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@104 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2009-12-21 16:23:09 +00:00
mrcolor
bc5bd4154e our current experimental Neutrino branch 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2009-12-08 11:05:11 +00:00