mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
5,398 Commits 1 Branch 51 Tags
32de6beef0ffe81ffa0444afcc43c416f18cc492
Commit Graph

62 Commits

Author SHA1 Message Date
Stefan Seyfried
32de6beef0 Merge remote-tracking branch 'check/next-cc' 
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.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/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h
 2013-09-01 19:46:10 +02:00
[CST] Focus
f210a8c048 neutrino: add EVT_BACK_ZAP_COMPLETE event for background epg scan zap 2013-08-13 20:10:02 +04:00
[CST] Focus
d886a95acd try to fix shutdown after wakeup, if several recordings was done, 
cancel shutdown after wakeup, if remote used, based on code (c) martii <m4rtii@gmx.de>
 2013-07-30 14:10: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
6cf3ceef4f neutrinoMessages.h, rcinput.cpp: add NeutrinoMessages::EVT_EIT_COMPLETE 2013-06-12 18:46:34 +04:00
Jacek Jendrzej
a549b97924 fix comma at end of enumerator list 2013-05-28 15:52:31 +02:00
Stefan Seyfried
8253c4d67c Merge remote-tracking branch 'check/next-cc' 
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
 2013-05-10 10:06:47 +02:00
Stefan Seyfried
d1cdbd34c8 rcinput: open input device with apropriate flags 2013-05-04 13:13:35 +02:00
Stefan Seyfried
e388b08dfe neutrino: remove glthread, use GLFramebuffer instead 
now that libstb-hal provides an easy to use virtual framebuffer,
use it instead of the glthread implementation.
 2013-05-04 13:07:52 +02:00
[CST] Focus
65bd112d78 driver/rcinput.cpp: add missing sleep, sub, pos keys 2013-03-06 15:42:23 +04:00
[CST] Focus
026592e8fe Merge branch 'dvbsi++' into next 
Conflicts:
	src/neutrino.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
 2013-02-28 16:39:34 +04:00
Stefan Seyfried
4dbeb3a31e neutrino: fix 32<->64bit format string warnings 
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t
 2013-02-21 15:47:18 +01:00
[CST] Focus
8267a53049 driver/rcinput.cpp: change device back to /dev/input/nevis_ir, apollo has link 2013-01-11 15:16:52 +04:00
[CST] Focus
6380763209 src/driver/rcinput.cpp: change ifdefs for headers and set_rc_hw 2013-01-11 14:04:07 +04:00
[CST] Bas
9448cd8d2a Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo 
Conflicts:
	src/nhttpd/yhttpd.cpp
 2012-12-07 14:39:05 +08:00
Stefan Seyfried
e5e7d52fa1 Merge branch 'uncool/dvbsi++' 
Conflicts:
	data/icons/border_lr.png
	data/icons/border_ul.png
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/system/setting_helpers.cpp
 2012-11-23 18:45:22 +01:00
Stefan Seyfried
e0282a0537 rcinput: add ugly hack for azbox rc 2012-11-21 23:49:59 +01:00
[CST] Bas
89bf2f6846 Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo 
Conflicts:
	src/neutrino.cpp
 2012-11-13 12:51:18 +08:00
satbaby
7d570537fd src/driver/rcinput.cpp: use standby_rc in repeat mode only if need 2012-11-12 12:23:23 +01:00
Stefan Seyfried
e0acbd3ddb neutrino: fix 32<->64bit format string warnings 
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t
 2012-11-03 14:05:48 +01: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
Stefan Seyfried
d5d136f6c1 add CRCInput::getKeyNameC to fix lifetime issues 
in menu.cpp, getKeyName().c_str()'s destructor was already invoked
when the value was used, triggering a valgrind warning.
 2012-10-31 22:52:12 +01:00
satbaby
654ca3656d neutrino: show epg infos on announce recording, ported from tuxcvs 2012-10-28 20:05:42 +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
d806eeb544 fixes for 64bit archs: don't assume a pointer is 32bit wide 2012-10-07 17:09:17 +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
S.R. van Loon
83636ebb6e neutrino: change all remote/frontpanel stuff to use the new headers. 2012-09-25 22:23:17 +08:00
satbaby
9124c20f31 comment out never used 2012-08-04 10:03:19 +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
[CST] Focus
5dd54caf54 fix conflict 2012-06-18 14:56:17 +04:00
satbaby
bc574e9688 use empty() instead of size() 2012-06-16 09:44:42 +02:00
[CST] Focus
35ee04049a remove obsolete and unused includes 2012-06-14 11:01:37 +04:00
Stefan Seyfried
81702dd86d neutrino: allow power button repeat on SPARK 2012-05-01 20:20:05 +02:00
Stefan Seyfried
fb39dc71e0 rcinput: reopen mandatory input devices 
this allows e.g. to restart lircd on spark without restarting neutrino
 2012-04-17 19:34:00 +02:00
Stefan Seyfried
ffc3aa983d rcinput: really ignore EV_SYN events 2012-04-17 19:33:57 +02:00
Stefan Seyfried
146c46da8e neutrino: fix input device repeat setting for pre 2.6.17 kernels 2012-04-17 19:33:57 +02:00
Stefan Seyfried
04ba38f14f neutrino: add support for the SPARK frontpanel buttons 2012-04-17 19:33:56 +02:00
Stefan Seyfried
40f50f88cc neutrino: silence rcinput debug output 2012-04-17 19:33:47 +02:00
[CST] Focus
361513c016 driver/rcinput.cpp: try to use monotonic time, 
ifdef old code with USE_GETTIMEOFDAY;
dont set time in neutrino
 2012-03-06 18:28:35 +04:00
[CST] Focus
ff1e40d684 driver/rcinput.cpp: process CZapitClient::EVT_TUNE_COMPLETE 2012-02-19 14:15:21 +04:00
satbaby
aa969f1fbe rcinput: -add RC_www 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2111 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-02-17 17:22:54 +00:00
focus
46b07752b9 Revert rev.2066 changes. Peace please. 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2067 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-01-18 08:58:13 +00:00
satbaby
e17d63131e seife:The svn is coolstream svn and not the other way 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2066 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-01-17 21:03:01 +00:00
seife
fe1fcbe426 rcinput: fix build without nevis_ir.h 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2062 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-01-15 21:54:59 +00:00
satbaby
101870c27a -add alternative remote controls option (thx, patch by bellum) 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2060 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-01-15 15:44:52 +00:00
seife
0fa97c1652 neutrino: remove special Tripledragon input handling 
With the new input device, no need for special casing in neutrino.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2052 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-01-09 20:32:26 +00:00
focus
5c8429673a Allow killTimer to check and reset timer id 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1562 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-07-21 10:04:05 +00:00
focus
3ad6c49d9a Add back key printf for DEBUG compile 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1302 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-03-16 10:53:02 +00:00
seife
6efb0d5e47 get rid of HAVE_DVB_API_VERSION define 
remove non-working legacy code

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1289 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-03-12 12:36:13 +00:00
seife
65ea10d988 fix compilerwarning in rcinput 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1268 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-03-06 18:37:09 +00:00