From 12c88455f0fa6b361ff08b099fc767adbbec4db8 Mon Sep 17 00:00:00 2001 From: gixxpunk Date: Tue, 10 May 2011 15:27:56 +0000 Subject: [PATCH] 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 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/f06962d6c4cfcb286e485e2c8636cf4339f086b4 Author: gixxpunk Date: 2011-05-10 (Tue, 10 May 2011) Origin message was: ------------------ - 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 --- src/global.h | 2 ++ src/gui/movieplayer.cpp | 9 +++++++++ src/neutrino.cpp | 14 -------------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/global.h b/src/global.h index 5179fe1b3..8dc9b30c1 100644 --- a/src/global.h +++ b/src/global.h @@ -68,6 +68,8 @@ #define NEUTRINO_RECORDING_ENDED_SCRIPT CONFIGDIR "/recording.end" #define NEUTRINO_ENTER_STANDBY_SCRIPT CONFIGDIR "/standby.on" #define NEUTRINO_LEAVE_STANDBY_SCRIPT CONFIGDIR "/standby.off" +#define MOVIEPLAYER_START_SCRIPT CONFIGDIR "/movieplayer.start" +#define MOVIEPLAYER_END_SCRIPT CONFIGDIR "/movieplayer.end" #define NEUTRINO_SCAN_SETTINGS_FILE CONFIGDIR "/scan.conf" #define NEUTRINO_PARENTALLOCKED_FILE DATADIR "/neutrino/.plocked" diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 574abc2cc..582dd99fe 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -302,6 +302,11 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey) isMovieBrowser = false; minuteoffset = MINUTEOFFSET; secondoffset = minuteoffset / 60; + + puts("[movieplayer.cpp] executing " MOVIEPLAYER_START_SCRIPT "."); + if (system(MOVIEPLAYER_START_SCRIPT) != 0) + perror(MOVIEPLAYER_START_SCRIPT " failed"); + #if 0 if (actionKey == "fileplayback") { cutNeutrino(); @@ -366,6 +371,10 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey) frameBuffer->useBackground(true); frameBuffer->paintBackground(); } + + puts("[movieplayer.cpp] executing " MOVIEPLAYER_END_SCRIPT "."); + if (system(MOVIEPLAYER_END_SCRIPT) != 0) + perror(MOVIEPLAYER_END_SCRIPT " failed"); restoreNeutrino(); CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index c6e847ec7..d22a01be7 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -257,20 +257,6 @@ CZapitClient::SatelliteList satList; CVCRControl::CDevice * recordingdevice = NULL; -#if 0 -#define NEUTRINO_SETTINGS_FILE CONFIGDIR "/neutrino.conf" - -#define NEUTRINO_RECORDING_TIMER_SCRIPT CONFIGDIR "/recording.timer" -#define NEUTRINO_RECORDING_START_SCRIPT CONFIGDIR "/recording.start" -#define NEUTRINO_RECORDING_ENDED_SCRIPT CONFIGDIR "/recording.end" -#define NEUTRINO_ENTER_STANDBY_SCRIPT CONFIGDIR "/standby.on" -#define NEUTRINO_LEAVE_STANDBY_SCRIPT CONFIGDIR "/standby.off" - -#define NEUTRINO_SCAN_SETTINGS_FILE CONFIGDIR "/scan.conf" -#define NEUTRINO_PARENTALLOCKED_FILE DATADIR "/neutrino/.plocked" -#define NEUTRINO_SCAN_START_SCRIPT CONFIGDIR "/recording.start" -#endif - static void initGlobals(void) { g_fontRenderer = NULL;