From 747b96bf7610538d0e2ba1bc20d9599fee646dbc Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Thu, 10 Oct 2013 19:01:24 +0400 Subject: [PATCH] neutrino.cpp: start epg scan on enter standby, wakeup epg scan on record stop Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/6c7b80010e705061322841b75148af19ec8a5801 Author: [CST] Focus Date: 2013-10-10 (Thu, 10 Oct 2013) --- src/neutrino.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index d4e856ab4..0bb83d1fa 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2648,9 +2648,13 @@ _repeat: if(!CRecordManager::getInstance()->RecordingStatus() && (!data)) { 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); } + /* try to wakeup epg scan */ + CEpgScan::getInstance()->Next(); } recordingstatus = data; autoshift = CRecordManager::getInstance()->TimeshiftOnly(); @@ -3250,7 +3254,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby ) g_Zapit->stopPip(); #endif 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); } else { g_Zapit->stopPlayBack(); @@ -3298,11 +3302,13 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby ) frameBuffer->setActive(false); // Active standby on powerManager->SetStandby(false, false); + CEpgScan::getInstance()->StartStandby(); } else { // Active standby off powerManager->SetStandby(false, false); cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000); videoDecoder->Standby(false); + CEpgScan::getInstance()->StopStandby(); if(init_cec_setting){ //init cec settings