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

driver/scanepg.cpp: do not restart rescan timer every end of scan

Browse Source
This commit is contained in:
[CST] Focus
2013-12-21 14:02:24 +04:00
parent 868574f50f
commit f3fdbca8cd
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/driver/scanepg.cpp
View File

@@ -142,7 +142,7 @@ void CEpgScan::Start(bool instandby)
live_channel_id = CZapit::getInstance()->GetCurrentChannelID(); live_channel_id = CZapit::getInstance()->GetCurrentChannelID();
AddTransponders(); AddTransponders();
standby = instandby; standby = instandby;
g_RCInput->killTimer(rescan_timer); //g_RCInput->killTimer(rescan_timer);
INFO("starting %s scan, scanning %d, scan map size: %d", standby ? "standby" : "live", scan_in_progress, scanmap.size()); INFO("starting %s scan, scanning %d, scan map size: %d", standby ? "standby" : "live", scan_in_progress, scanmap.size());
if (standby || !scan_in_progress) if (standby || !scan_in_progress)
Next(); Next();
@@ -166,6 +166,7 @@ int CEpgScan::handleMsg(const neutrino_msg_t msg, neutrino_msg_data_t data)
INFO("rescan timer in %s mode, scanning %d", standby ? "standby" : "live", scan_in_progress); INFO("rescan timer in %s mode, scanning %d", standby ? "standby" : "live", scan_in_progress);
scanned.clear(); scanned.clear();
Clear(); Clear();
g_RCInput->killTimer(rescan_timer);
if (standby || (CFEManager::getInstance()->getEnabledCount() > 1)) { if (standby || (CFEManager::getInstance()->getEnabledCount() > 1)) {
if (standby) if (standby)
g_Zapit->setStandby(false); g_Zapit->setStandby(false);
@@ -239,8 +240,9 @@ void CEpgScan::EnterStandby()
g_Zapit->setStandby(true); g_Zapit->setStandby(true);
g_Sectionsd->setPauseScanning(true); g_Sectionsd->setPauseScanning(true);
} }
g_RCInput->killTimer(rescan_timer); //g_RCInput->killTimer(rescan_timer);
rescan_timer = g_RCInput->addTimer(EPG_RESCAN_TIME*1000ULL*1000ULL, true); if (rescan_timer == 0)
rescan_timer = g_RCInput->addTimer(EPG_RESCAN_TIME*1000ULL*1000ULL, true);
INFO("rescan timer id %d", rescan_timer); INFO("rescan timer id %d", rescan_timer);
} }