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

Merge branch 'master' into multituner

Browse Source
This commit is contained in:
[CST] Focus
2012-03-08 19:03:35 +04:00
parent 55f29c5daf d1fd82053c
commit 508929d5f2
3 changed files with 16 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/neutrino.cpp
View File

@@ -2960,6 +2960,9 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
standby.timer_minutes_hi = fp_timer >> 8;;
standby.timer_minutes_lo = fp_timer & 0xFF;
delete videoDecoder;
cs_api_exit();
int fd = open("/dev/display", O_RDONLY);
if (fd < 0) {
perror("/dev/display");
@@ -3047,7 +3050,7 @@ void CNeutrinoApp::saveEpg()
neutrino_msg_data_t data;
g_Sectionsd->writeSI2XML(g_settings.epg_dir.c_str());
while( true ) {
g_RCInput->getMsg(&msg, &data, 300); // 30 secs..
g_RCInput->getMsg(&msg, &data, 1200); // 120 secs..
if (( msg == CRCInput::RC_timeout ) || (msg == NeutrinoMessages::EVT_SI_FINISHED)) {
//printf("Msg %x timeout %d EVT_SI_FINISHED %x\n", msg, CRCInput::RC_timeout, NeutrinoMessages::EVT_SI_FINISHED);
break;
@@ -3722,7 +3725,6 @@ void stop_daemons(bool stopall)
delete powerManager;
}
cs_deregister_messenger();
cs_api_exit();
}
}
@@ -3735,6 +3737,8 @@ void sighandler (int signum)
delete CRecordManager::getInstance();
CNeutrinoApp::getInstance()->saveSetup(NEUTRINO_SETTINGS_FILE);
stop_daemons();
delete videoDecoder;
cs_api_exit();
_exit(0);
default:
break;