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

- neutrino: remove unused write_si from ExitRun() function ...

Browse Source 
and rename retcode to can_shutdown for a better readability
This commit is contained in:
svenhoefer
2017-03-19 23:50:52 +01:00
parent de1ee8b73a
commit ec6e863e6f
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/neutrino.cpp
View File

@@ -2270,7 +2270,7 @@ TIMER_STOP("################################## after all #######################
} }
RealRun(); RealRun();
ExitRun(true, g_info.hw_caps->can_shutdown); ExitRun(g_info.hw_caps->can_shutdown);
return 0; return 0;
} }
@@ -3368,7 +3368,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
} }
else if( msg == NeutrinoMessages::SHUTDOWN ) { else if( msg == NeutrinoMessages::SHUTDOWN ) {
if(!skipShutdownTimer) { if(!skipShutdownTimer) {
ExitRun(true, g_info.hw_caps->can_shutdown); ExitRun(g_info.hw_caps->can_shutdown);
} }
else { else {
skipShutdownTimer=false; skipShutdownTimer=false;
@@ -3378,7 +3378,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
else if( msg == NeutrinoMessages::REBOOT ) { else if( msg == NeutrinoMessages::REBOOT ) {
FILE *f = fopen("/tmp/.reboot", "w"); FILE *f = fopen("/tmp/.reboot", "w");
fclose(f); fclose(f);
ExitRun(true); ExitRun();
} }
else if (msg == NeutrinoMessages::EVT_POPUP || msg == NeutrinoMessages::EVT_EXTMSG) { else if (msg == NeutrinoMessages::EVT_POPUP || msg == NeutrinoMessages::EVT_EXTMSG) {
if (mode != mode_scart && mode != mode_standby) { if (mode != mode_scart && mode != mode_standby) {
@@ -3541,9 +3541,10 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
extern time_t timer_minutes;//timermanager.cpp extern time_t timer_minutes;//timermanager.cpp
extern bool timer_is_rec;//timermanager.cpp extern bool timer_is_rec;//timermanager.cpp
void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode) void CNeutrinoApp::ExitRun(int can_shutdown)
{ {
printf("[neutrino] %s retcode: %d can_shutdown: %d\n", __func__, retcode, g_info.hw_caps->can_shutdown); printf("[neutrino] %s can_shutdown: %d\n", __func__, g_info.hw_caps->can_shutdown);
bool do_shutdown = true; bool do_shutdown = true;
CRecordManager::getInstance()->StopAutoRecord(); CRecordManager::getInstance()->StopAutoRecord();
@@ -3576,16 +3577,16 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
} }
/* on shutdown force load new fst */ /* on shutdown force load new fst */
if (retcode) if (can_shutdown)
CheckFastScan(true, false); CheckFastScan(true, false);
CVFD::getInstance()->setMode(CVFD::MODE_SHUTDOWN); CVFD::getInstance()->setMode(CVFD::MODE_SHUTDOWN);
stop_daemons(true /*retcode*/);//need here for timer_is_rec before saveSetup stop_daemons(true /*can_shutdown*/);//need here for timer_is_rec before saveSetup
g_settings.shutdown_timer_record_type = timer_is_rec; g_settings.shutdown_timer_record_type = timer_is_rec;
saveSetup(NEUTRINO_SETTINGS_FILE); saveSetup(NEUTRINO_SETTINGS_FILE);
if(retcode) { if (can_shutdown) {
puts("[neutrino.cpp] executing " NEUTRINO_ENTER_DEEPSTANDBY_SCRIPT "."); puts("[neutrino.cpp] executing " NEUTRINO_ENTER_DEEPSTANDBY_SCRIPT ".");
if (my_system(NEUTRINO_ENTER_DEEPSTANDBY_SCRIPT) != 0) if (my_system(NEUTRINO_ENTER_DEEPSTANDBY_SCRIPT) != 0)
perror(NEUTRINO_ENTER_DEEPSTANDBY_SCRIPT " failed"); perror(NEUTRINO_ENTER_DEEPSTANDBY_SCRIPT " failed");
@@ -3665,8 +3666,8 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
//CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_MAINMENU_REBOOT)); //CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_MAINMENU_REBOOT));
stop_video(); stop_video();
Cleanup(); Cleanup();
//_exit(retcode); //_exit(can_shutdown);
exit(retcode); exit(can_shutdown);
} }
} }
} }
@@ -4029,13 +4030,13 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
ShowMsg(LOCALE_SETTINGS_HELP, LOCALE_RECORDINGMENU_HELP, CMsgBox::mbrBack, CMsgBox::mbBack); ShowMsg(LOCALE_SETTINGS_HELP, LOCALE_RECORDINGMENU_HELP, CMsgBox::mbrBack, CMsgBox::mbBack);
} }
else if(actionKey=="shutdown") { else if(actionKey=="shutdown") {
ExitRun(true, 1); ExitRun(1);
} }
else if(actionKey=="reboot") else if(actionKey=="reboot")
{ {
FILE *f = fopen("/tmp/.reboot", "w"); FILE *f = fopen("/tmp/.reboot", "w");
fclose(f); fclose(f);
ExitRun(true); ExitRun();
unlink("/tmp/.reboot"); unlink("/tmp/.reboot");
returnval = menu_return::RETURN_NONE; returnval = menu_return::RETURN_NONE;
} }

2
src/neutrino.h
View File

@@ -119,7 +119,7 @@ private:
void standbyMode( bool bOnOff, bool fromDeepStandby = false ); void standbyMode( bool bOnOff, bool fromDeepStandby = false );
void getAnnounceEpgName(CTimerd::RecordingInfo * eventinfo, std::string &name); void getAnnounceEpgName(CTimerd::RecordingInfo * eventinfo, std::string &name);
void ExitRun(const bool write_si = true, int retcode = 0); void ExitRun(int can_shutdown = 0);
void RealRun(); void RealRun();
void InitZapper(); void InitZapper();
void InitTimerdClient(); void InitTimerdClient();