neutrino.cpp: start epg scan on enter standby, wakeup epg scan on record stop

Origin commit data
------------------
Commit: 6c7b80010e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-10 (Thu, 10 Oct 2013)
This commit is contained in:
[CST] Focus
2013-10-10 19:01:24 +04:00
parent 294db1d405
commit 747b96bf76

View File

@@ -2648,9 +2648,13 @@ _repeat:
if(!CRecordManager::getInstance()->RecordingStatus() && (!data)) if(!CRecordManager::getInstance()->RecordingStatus() && (!data))
{ {
if(mode == mode_standby) { if(mode == mode_standby) {
g_Zapit->setStandby(true); /* do not put zapit to standby, if epg scan not finished */
if (!CEpgScan::getInstance()->Running())
g_Zapit->setStandby(true);
cpuFreq->SetCpuFreq(g_settings.standby_cpufreq * 1000 * 1000); cpuFreq->SetCpuFreq(g_settings.standby_cpufreq * 1000 * 1000);
} }
/* try to wakeup epg scan */
CEpgScan::getInstance()->Next();
} }
recordingstatus = data; recordingstatus = data;
autoshift = CRecordManager::getInstance()->TimeshiftOnly(); autoshift = CRecordManager::getInstance()->TimeshiftOnly();
@@ -3250,7 +3254,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
g_Zapit->stopPip(); g_Zapit->stopPip();
#endif #endif
bool stream_status = CStreamManager::getInstance()->StreamStatus(); bool stream_status = CStreamManager::getInstance()->StreamStatus();
if(!fromDeepStandby && !CRecordManager::getInstance()->RecordingStatus() && !stream_status) { if(!g_settings.epg_scan && !fromDeepStandby && !CRecordManager::getInstance()->RecordingStatus() && !stream_status) {
g_Zapit->setStandby(true); g_Zapit->setStandby(true);
} else { } else {
g_Zapit->stopPlayBack(); g_Zapit->stopPlayBack();
@@ -3298,11 +3302,13 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
frameBuffer->setActive(false); frameBuffer->setActive(false);
// Active standby on // Active standby on
powerManager->SetStandby(false, false); powerManager->SetStandby(false, false);
CEpgScan::getInstance()->StartStandby();
} else { } else {
// Active standby off // Active standby off
powerManager->SetStandby(false, false); powerManager->SetStandby(false, false);
cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000); cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000);
videoDecoder->Standby(false); videoDecoder->Standby(false);
CEpgScan::getInstance()->StopStandby();
if(init_cec_setting){ if(init_cec_setting){
//init cec settings //init cec settings