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

18
src/driver/record.cpp
View File

@@ -1633,12 +1633,11 @@ bool CRecordManager::RunStartScript(void)
if(RecordingStatus())
return false;
puts("[neutrino.cpp] executing " NEUTRINO_RECORDING_START_SCRIPT ".");
if (my_system(NEUTRINO_RECORDING_START_SCRIPT) != 0) {
perror(NEUTRINO_RECORDING_START_SCRIPT " failed");
return false;
}
return true;
#if 0
printf("CRecordManager::%s: wakeup hdd...\n", __func__);
wakeup_hdd(g_settings.network_nfs_recordingdir.c_str(),true);
#endif
return exec_controlscript(NEUTRINO_RECORDING_START_SCRIPT);
}
bool CRecordManager::RunStopScript(void)
@@ -1647,12 +1646,7 @@ bool CRecordManager::RunStopScript(void)
if(RecordingStatus())
return false;
puts("[neutrino.cpp] executing " NEUTRINO_RECORDING_ENDED_SCRIPT ".");
if (my_system(NEUTRINO_RECORDING_ENDED_SCRIPT) != 0) {
perror(NEUTRINO_RECORDING_ENDED_SCRIPT " failed");
return false;
}
return true;
return exec_controlscript(NEUTRINO_RECORDING_ENDED_SCRIPT);
}
/*

4
src/driver/shutdown_count.cpp
View File

@@ -125,9 +125,7 @@ void SHTDCNT::shutdown_counter()
} else if(sleeptimer_active && !CNeutrinoApp::getInstance ()->recordingstatus) {
sleeptimer_active = false;
puts("[SHTDCNT] executing " NEUTRINO_ENTER_INACTIVITY_SCRIPT ".");
if (my_system(NEUTRINO_ENTER_INACTIVITY_SCRIPT) != 0)
perror(NEUTRINO_ENTER_INACTIVITY_SCRIPT " failed");
exec_controlscript(NEUTRINO_ENTER_INACTIVITY_SCRIPT);
printf("[SHTDCNT] sleep-timer send NeutrinoMessages::SLEEPTIMER\n");
g_RCInput->postMsg(NeutrinoMessages::SLEEPTIMER, 1);