mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

use new exec_controlscript() function

Browse Source 
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
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;
//NI InfoIcons
#include <gui/infoicons.h>
#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();
@@ -231,9 +229,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) {