mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 09:51:22 +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

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);