use new exec_controlscript() function

Origin commit data
------------------
Branch: ni/coolstream
Commit: a84dbc4741
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-26 (Sat, 26 Jan 2019)

Origin message was:
------------------
- use new exec_controlscript() function

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2019-01-26 17:05:44 +01:00
parent 3216bdcce3
commit eda65db6b3
8 changed files with 44 additions and 88 deletions

View File

@@ -90,8 +90,8 @@
#define LCD_MODE CVFD::MODE_MOVIE
#endif
#define MOVIEPLAYER_START_SCRIPT CONTROLDIR "/movieplayer.start"
#define MOVIEPLAYER_END_SCRIPT CONTROLDIR "/movieplayer.end"
#define MOVIEPLAYER_START_SCRIPT "movieplayer.start"
#define MOVIEPLAYER_END_SCRIPT "movieplayer.end"
extern cVideo * videoDecoder;
extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */
@@ -387,11 +387,7 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
}
}
if (!access(MOVIEPLAYER_START_SCRIPT, X_OK)) {
puts("[movieplayer.cpp] executing " MOVIEPLAYER_START_SCRIPT ".");
if (my_system(MOVIEPLAYER_START_SCRIPT) != 0)
perror(MOVIEPLAYER_START_SCRIPT " failed");
}
exec_controlscript(MOVIEPLAYER_START_SCRIPT);
Cleanup();
ClearFlags();
@@ -480,11 +476,7 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
bookmarkmanager->flush();
if (!access(MOVIEPLAYER_END_SCRIPT, X_OK)) {
puts("[movieplayer.cpp] executing " MOVIEPLAYER_END_SCRIPT ".");
if (my_system(MOVIEPLAYER_END_SCRIPT) != 0)
perror(MOVIEPLAYER_END_SCRIPT " failed");
}
exec_controlscript(MOVIEPLAYER_END_SCRIPT);
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);