From 2bcd32732d9cb9e4ef4e7dbaad112d2cc3bb8463 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Sat, 26 Jan 2019 17:05:43 +0100 Subject: [PATCH] - align defines for control scripts Conflicts: src/global.h src/gui/pictureviewer.cpp Signed-off-by: Thilo Graf --- src/global.h | 21 +++++++++++---------- src/gui/audioplayer.cpp | 4 ++-- src/gui/movieplayer.cpp | 4 ++-- src/gui/pictureviewer.cpp | 9 ++++++--- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/global.h b/src/global.h index df7ee1f0d..f864dd14e 100644 --- a/src/global.h +++ b/src/global.h @@ -31,16 +31,17 @@ #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_ENTER_INACTIVITY_SCRIPT CONFIGDIR "/inactivity.on" -#define NEUTRINO_ENTER_DEEPSTANDBY_SCRIPT CONFIGDIR "/deepstandby.on" -#define NEUTRINO_LEAVE_DEEPSTANDBY_SCRIPT CONFIGDIR "/deepstandby.off" -#define NEUTRINO_ENTER_FLASH_SCRIPT CONFIGDIR "/flash.start" -#define NEUTRINO_APP_START_SCRIPT CONFIGDIR "/neutrino.start" +#define NEUTRINO_RECORDING_TIMER_SCRIPT CONTROLDIR "/recording.timer" +#define NEUTRINO_RECORDING_START_SCRIPT CONTROLDIR "/recording.start" +#define NEUTRINO_RECORDING_ENDED_SCRIPT CONTROLDIR "/recording.end" +#define NEUTRINO_ENTER_STANDBY_SCRIPT CONTROLDIR "/standby.on" +#define NEUTRINO_LEAVE_STANDBY_SCRIPT CONTROLDIR "/standby.off" +#define NEUTRINO_ENTER_INACTIVITY_SCRIPT CONTROLDIR "/inactivity.on" +#define NEUTRINO_ENTER_DEEPSTANDBY_SCRIPT CONTROLDIR "/deepstandby.on" +#define NEUTRINO_LEAVE_DEEPSTANDBY_SCRIPT CONTROLDIR "/deepstandby.off" +#define NEUTRINO_ENTER_FLASH_SCRIPT CONTROLDIR "/flash.start" +#define NEUTRINO_APP_START_SCRIPT CONTROLDIR "/neutrino.start" + #define NEUTRINO_SCAN_SETTINGS_FILE CONFIGDIR "/scan.conf" #define NEUTRINO_PARENTALLOCKED_FILE DATADIR "/neutrino/.plocked" diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index ffdb5de25..1a0212ec1 100644 --- a/src/gui/audioplayer.cpp +++ b/src/gui/audioplayer.cpp @@ -90,8 +90,8 @@ extern cVideo * videoDecoder; // check if files to be added are already in the playlist #define AUDIOPLAYER_CHECK_FOR_DUPLICATES -#define AUDIOPLAYER_START_SCRIPT CONFIGDIR "/audioplayer.start" -#define AUDIOPLAYER_END_SCRIPT CONFIGDIR "/audioplayer.end" +#define AUDIOPLAYER_START_SCRIPT CONTROLDIR "/audioplayer.start" +#define AUDIOPLAYER_END_SCRIPT CONTROLDIR "/audioplayer.end" #define DEFAULT_RADIOSTATIONS_XMLFILE CONFIGDIR "/radio-stations.xml" #define DEFAULT_RADIOFAVORITES_XMLFILE CONFIGDIR "/radio-favorites.xml" diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index e7a654098..a614d6f3e 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -91,8 +91,8 @@ #define LCD_MODE CVFD::MODE_MOVIE #endif -#define MOVIEPLAYER_START_SCRIPT CONFIGDIR "/movieplayer.start" -#define MOVIEPLAYER_END_SCRIPT CONFIGDIR "/movieplayer.end" +#define MOVIEPLAYER_START_SCRIPT CONTROLDIR "/movieplayer.start" +#define MOVIEPLAYER_END_SCRIPT CONTROLDIR "/movieplayer.end" extern cVideo * videoDecoder; extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */ diff --git a/src/gui/pictureviewer.cpp b/src/gui/pictureviewer.cpp index 5b38d72ff..dfa1f6f0d 100644 --- a/src/gui/pictureviewer.cpp +++ b/src/gui/pictureviewer.cpp @@ -67,8 +67,8 @@ #include -#include #include +#include #include #include @@ -79,8 +79,11 @@ #include extern cVideo * videoDecoder; -#define PICTUREVIEWER_START_SCRIPT CONFIGDIR "/pictureviewer.start" -#define PICTUREVIEWER_END_SCRIPT CONFIGDIR "/pictureviewer.end" + + + +#define PICTUREVIEWER_START_SCRIPT CONTROLDIR "/pictureviewer.start" +#define PICTUREVIEWER_END_SCRIPT CONTROLDIR "/pictureviewer.end" //------------------------------------------------------------------------ bool comparePictureByDate (const CPicture& a, const CPicture& b)