mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-14 00:43:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

- use new exec_controlscript() function

Browse Source 
Conflicts:
	src/driver/record.cpp
	src/global.h
	src/neutrino.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2019-01-26 17:05:44 +01:00
committed by Thilo Graf
parent b027bec157
commit 9c77ed6269
8 changed files with 51 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/pictureviewer.cpp
View File

@@ -82,8 +82,8 @@ extern cVideo * videoDecoder;
#define PICTUREVIEWER_START_SCRIPT CONTROLDIR "/pictureviewer.start"
#define PICTUREVIEWER_END_SCRIPT CONTROLDIR "/pictureviewer.end"
#define PICTUREVIEWER_START_SCRIPT "pictureviewer.start"
#define PICTUREVIEWER_END_SCRIPT "pictureviewer.end"
//------------------------------------------------------------------------
bool comparePictureByDate (const CPicture& a, const CPicture& b)
@@ -194,9 +194,7 @@ int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & actionKey)
if (parent)
parent->hide();
puts("[pictureviewer.cpp] executing " PICTUREVIEWER_START_SCRIPT ".");
if (my_system(PICTUREVIEWER_START_SCRIPT) != 0)
perror(PICTUREVIEWER_START_SCRIPT " failed");
exec_controlscript(PICTUREVIEWER_START_SCRIPT);
// remember last mode
m_LastMode = CNeutrinoApp::getInstance()->getMode();
@@ -227,9 +225,7 @@ int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & actionKey)
CZapit::getInstance()->EnablePlayback(true);
}
puts("[pictureviewer.cpp] executing " PICTUREVIEWER_END_SCRIPT ".");
if (my_system(PICTUREVIEWER_END_SCRIPT) != 0)
perror(PICTUREVIEWER_END_SCRIPT " failed");
exec_controlscript(PICTUREVIEWER_END_SCRIPT);
// Restore previous background
if (usedBackground) {