mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 02:11:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,355 Commits 1 Branch 51 Tags
8381f1a8cfbf5f23e4d7eb30e0615bc5c9c67316
Commit Graph

20 Commits

Author SHA1 Message Date
Stefan Seyfried
ee3580214f auto-enumerate FONT_TYPE_COUNT instead of defining it 2013-04-13 17:27:21 +02:00
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
svenhoefer
3b9193982b - shutdown_count.cpp: add NEUTRINO_ENTER_INACTIVITY_SCRIPT 
script will be executed if g_settings.shutdown_min expires
 2012-11-01 20:30:18 +01:00
svenhoefer
5284ffa3d6 - neutrino.cpp: handle deepstandy-scripts in same way as the other scripts 2012-10-29 14:29:03 +01:00
Stefan Seyfried
0061aac2b3 fix build for boxtype "generic" 2012-10-07 17:09:17 +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
Stefan Seyfried
2541edc918 neutrino: first preliminary support for AZbox ME 
this is very experimental and depends on more fixes in
libstb-hal, but audio / video / OSD are basically working
 2012-06-27 21:18:19 +02:00
[CST] Focus
35ee04049a remove obsolete and unused includes 2012-06-14 11:01:37 +04:00
Stefan Seyfried
eabeec110c spark: build stubbed out lcddisplay code to fix build 2012-04-17 19:33:53 +02:00
[CST] Focus
c78a8b364b global.h: remove zapitclient.h 2012-04-10 16:52:19 +04:00
[CST] Focus
53ebe19696 Merge branch 'includecleanup' into dvbsi++ 2012-03-08 11:18:52 +04:00
[CST] Focus
8e3c19d448 rename EventList to CNeutrinoEventList - conflict with libdvbsi++ 2012-03-07 21:03:47 +04:00
[CST] Bas
9b33a52d86 src: fix compile after include change. 2012-03-04 15:54:01 +08:00
seife
7f9cbe76da neutrino: phase out last bits of controld code 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1825 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-11-05 11:44:03 +00:00
thilo
9609466f48 *neutrino: trivial sort of includes and whitespace cleanups 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1503 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-06-02 20:44:45 +00:00
striper
ec402d9518 - add support for radiotext (needs testing) -> http://www.dbox2world.net/board293-coolstream-hd1/board296-coolstream-software/10635-radiotext-einbauen/ 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1501 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-06-02 15:29:40 +00:00
striper
f06962d6c4 - add movieplayer.start & movieplayer.end script (untested) 
- small cleanup

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1453 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-05-10 15:27:56 +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
thilo
632d7dd2e9 tuxbox-port: use new class modules, 
this is one first part of ported parts from tuxbox,
comming soon there are comming more parts, but it's a lot to do,
see also: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/9565-diskussion-neutrino-goes-neutrinohd-welche-features-funktionen-aus-dem-tuxbox-cvs-%C3%BCbernehmen/

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@901 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-11-27 23:17:30 +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