neutrino.cpp: pause sectionsd on shutdown before saving epg,

stop epgscan to restore live channel id in case shutdown started from standby mode,
fix hdd wakeup on record announce


Origin commit data
------------------
Branch: ni/coolstream
Commit: a9e3666b0a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-12 (Wed, 12 Feb 2014)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2014-02-12 16:41:41 +04:00
parent 462b2cbf6d
commit 3b37f436b3

View File

@@ -127,7 +127,6 @@
int old_b_id = -1;
CHintBox * reloadhintBox = 0;
bool has_hdd;
CInfoClock *InfoClock;
int allow_flash = 1;
@@ -2833,9 +2832,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
break;
}
}
if(has_hdd) {
wakeup_hdd(g_settings.network_nfs_recordingdir.c_str());
}
wakeup_hdd(recordingDir);
}
if( g_settings.recording_zap_on_announce && (mode != mode_standby) && (eventinfo->channel_id != CZapit::getInstance()->GetCurrentChannelID())) {
@@ -3089,7 +3086,9 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
frameBuffer->paintBackground();
videoDecoder->ShowPicture(DATADIR "/neutrino/icons/shutdown.jpg");
CEpgScan::getInstance()->Stop();
if(g_settings.epg_save /* && timeset && g_Sectionsd->getIsTimeSet ()*/) {
g_Sectionsd->setPauseScanning(true);
saveEpg(true);// true CVFD::MODE_SHUTDOWN
}
CVFD::getInstance()->setMode(CVFD::MODE_SHUTDOWN);