From ece7ad7e4f551f21efd32ae8f577903efba9dc16 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 26 Jan 2019 17:05:43 +0100 Subject: [PATCH] movieplayer: move MOVIEPLAYER_START/END_SCRIPT defines to movieplayer Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/293c20c122296f655ade4e1f42c9e811739884af Author: vanhofen Date: 2019-01-26 (Sat, 26 Jan 2019) Origin message was: ------------------ - movieplayer: move MOVIEPLAYER_START/END_SCRIPT defines to movieplayer ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/global.h | 2 -- src/gui/movieplayer.cpp | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/global.h b/src/global.h index 91f5b27cd..f0aceac1e 100644 --- a/src/global.h +++ b/src/global.h @@ -39,8 +39,6 @@ #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 MOVIEPLAYER_START_SCRIPT CONFIGDIR "/movieplayer.start" -#define MOVIEPLAYER_END_SCRIPT CONFIGDIR "/movieplayer.end" #define NEUTRINO_ENTER_FLASH_SCRIPT CONFIGDIR "/flash.start" #define NEUTRINO_APP_START_SCRIPT CONFIGDIR "/neutrino.start" #define NEUTRINO_CONF_MIGRATION_SCRIPT CONFIGDIR "/migration.sh" diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index cfd05aecb..dd0eefebd 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -90,6 +90,9 @@ #define LCD_MODE CVFD::MODE_MOVIE #endif +#define MOVIEPLAYER_START_SCRIPT CONFIGDIR "/movieplayer.start" +#define MOVIEPLAYER_END_SCRIPT CONFIGDIR "/movieplayer.end" + extern cVideo * videoDecoder; extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */