mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 00:41:09 +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

17
src/gui/scan.cpp
View File

@@ -59,8 +59,8 @@
extern cVideo * videoDecoder;
#define NEUTRINO_SCAN_START_SCRIPT CONFIGDIR "/scan.start"
#define NEUTRINO_SCAN_STOP_SCRIPT CONFIGDIR "/scan.stop"
#define NEUTRINO_SCAN_START_SCRIPT "scan.start"
#define NEUTRINO_SCAN_STOP_SCRIPT "scan.stop"
#define BAR_BORDER 2
#define BAR_WIDTH 150
@@ -291,10 +291,8 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
}
success = false;
if(!manual) {
if (my_system(NEUTRINO_SCAN_START_SCRIPT) != 0)
perror(NEUTRINO_SCAN_START_SCRIPT " failed");
}
if (!manual)
exec_controlscript(NEUTRINO_SCAN_START_SCRIPT);
g_Zapit->setScanBouquetMode( (CZapitClient::bouquetMode)scansettings.bouquetMode);
@@ -359,10 +357,9 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
/* to join scan thread */
g_Zapit->stopScan();
if(!manual) {
if (my_system(NEUTRINO_SCAN_STOP_SCRIPT) != 0)
perror(NEUTRINO_SCAN_STOP_SCRIPT " failed");
}
if (!manual)
exec_controlscript(NEUTRINO_SCAN_STOP_SCRIPT);
if(!test) {
CComponentsHeader header(x, y, width, hheight, success ? LOCALE_SCANTS_FINISHED : (canceled ? LOCALE_SCANTS_CANCELED : LOCALE_SCANTS_FAILED));
header.paint(CC_SAVE_SCREEN_NO);