Commit Graph

87 Commits

Author SHA1 Message Date
Stefan Seyfried
d244a5991a Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp
2013-10-21 22:58:55 +02:00
Thilo Graf
9bc7a6efca CPlugins: remove dub included header 2013-09-04 09:59:09 +02:00
Stefan Seyfried
6593e3b991 luainstance: the name is "Lua", not "LUA" 2013-03-18 16:10:01 +01:00
Stefan Seyfried
da358e7502 neutrino: add a prototype of a lua plugin interface
this is just for preliminary tests, not yet really usable
for anything useful
2013-03-17 23:24:45 +01:00
Stefan Seyfried
988a8ebec2 helpers: improve my_system function
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.

Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>
2013-03-05 11:58:49 +01:00
Stefan Seyfried
96650cdd45 helpers: improve my_system function
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.
2013-03-03 19:18:13 +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
satbaby
882a7b2e47 src/gui/plugins.cpp: fix sort pluins without index 2012-12-04 19:57:02 +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
satbaby
768a064629 Zombie Killer ;) 2012-09-20 22:43:00 +02:00
Stefan Seyfried
2e46d81b88 Merge branch 'neutrino-hd-tripledragon' into neutrino-mp 2012-09-15 12:14:33 +02:00
satbaby
c6ae7255ac -add wakeup_hdd & file_exists to system-helpers 2012-09-11 20:35:47 +02:00
FlatTV
b92660259c Add global helpers my_system() and my_popen() 2012-08-30 09:28:54 +02:00
satbaby
a6d0331ed9 plugins.cpp: use popen2 with vfork for script plugins 2012-08-22 09:39:08 +02:00
satbaby
abed344501 plugins.cpp: use popen2 with vfork for script plugins 2012-08-22 09:37:46 +02:00
Stefan Seyfried
e65cfee56f plugins: don't blit over plugin output every second 2012-08-14 12:14:41 +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
b9648c8359 change mysytem char to const char 2012-07-09 14:58:11 +02:00
satbaby
e6d4c04913 revert spawn funktion 2012-06-20 23:08:40 +02:00
satbaby
854e222603 plugins.cpp: start plugin script with posix spawn 2012-06-20 20:17:18 +02:00
satbaby
25563a2029 never used values 2012-05-08 16:31:25 +02:00
[CST] Focus
37d5e13d43 gui/plugins.cpp: fix memleak in scandir 2012-05-04 12:23:44 +04:00
satbaby
bb347b3a44 performance Prefer prefix ++/-- operators for non-primitive types. 2012-04-28 10:56:27 +02:00
satbaby
1fdb76af51 plugins.cpp localize.cpp: fix possible segfault 2012-04-24 13:36:16 +02:00
Stefan Seyfried
201bb3524d CPlugins: align with original neutrino code, small optimization 2012-04-17 19:33:57 +02:00
[CST] Bas
3d96ea9419 gui: fix compile after include change. 2012-03-04 15:50:56 +08:00
thilo
aaa988db5f *neutrino: port personalize feature from tuxbox
This is a partial port of original neutrino personalize feature
and includes also moving of user menu settings from key setup into this setup,
but it's not completley yet in some details and so I think it's a lot to do.
I hope it works fine and the many user requests are justifying this feature.

TODO:
- doc into wiki
- adapt for yWeb
- some reworks for user menu settings and plugin management
- add timer and rework tv radio mode switch item(s)
and many more...

please report: 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-beta@2010 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-12-28 00:19:15 +00:00
thilo
e6dbbc323f *neutrino usermenu plugin: fix plugin call
Plugin call was broken because of a merge error.

add config parameter 'index' and 'key' for plugins
This allows (optional) to config an user definied sort and setup rc-key for plugin via
plugin.cfg.

Sort by filename is still working as before in second instance.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1660 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-09-02 17:05:55 +00:00
thilo
31c42c1106 *neutrino plugin-class: style correcture
add missing constructor

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1363 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-03-31 13:44:45 +00:00
seife
870fc37cf6 neutrino: export screen dimensions, so that plugins don't need to jump through ugly hoops
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1176 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-02-20 17:00:55 +00:00
satbaby
9699447317 -add plugin hdd dir menu
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@734 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-08-20 19:11:12 +00:00
focus
35d7d555b6 Removed libcontrold dependency
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@336 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-02-14 13:09:07 +00:00
mws
e1c39d4ce5 fix initializers and shadows
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@122 e54a6e83-5905-42d5-8d5c-058d10e6a962
2009-12-29 11:44:31 +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
satbaby
49e009134b port rounded corner code from tuxbox CVSuse getScreenStartX(),getScreenStartY(),h_max(),w_max() routines
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@87 e54a6e83-5905-42d5-8d5c-058d10e6a962
2009-12-17 09:58:55 +00:00
mws
9bcbe03475 comment in unused variables,
replace #warning statements 



git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@60 e54a6e83-5905-42d5-8d5c-058d10e6a962
2009-12-16 15:34:26 +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