frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

The EIT scan no longer deletes the scanList if no device was switched in this pass

Browse Source
This commit is contained in:
Klaus Schmidinger 2024-03-10 10:38:18 +01:00
parent bc32ffe2f9
commit 6a09a2fbd6
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -9887,7 +9887,7 @@ Video Disk Recorder Revision History
- Fixed possible duplicate component entries in the info of an ongoing recording - Fixed possible duplicate component entries in the info of an ongoing recording
(reported by Christoph Haubrich). (reported by Christoph Haubrich).
2024-03-08: 2024-03-10:
- Fixed the move assignment operator to check for self-assignment (suggested by - Fixed the move assignment operator to check for self-assignment (suggested by
Stefan Herdler). Stefan Herdler).
@ -9909,3 +9909,4 @@ Video Disk Recorder Revision History
- Logging event status changes now also shows the previous status (thanks to Markus - Logging event status changes now also shows the previous status (thanks to Markus
Ehrnsperger). Ehrnsperger).
- Fixed logging when a timer has entered the VPS margin. - Fixed logging when a timer has entered the VPS margin.
- The EIT scan no longer deletes the scanList if no device was switched in this pass.

15
eitscan.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: eitscan.c 5.1 2024/03/04 21:13:58 kls Exp $ * $Id: eitscan.c 5.2 2024/03/10 10:38:18 kls Exp $
*/ */
#include "eitscan.h" #include "eitscan.h"
@ -94,7 +94,7 @@ cEITScanner::cEITScanner(void)
lastScan = 0; lastScan = 0;
lastActivity = time(NULL); lastActivity = time(NULL);
currentChannel = 0; currentChannel = 0;
scanList = NULL; scanList = new cScanList;
transponderList = NULL; transponderList = NULL;
} }
@ -131,12 +131,11 @@ void cEITScanner::Process(void)
if (Setup.EPGScanTimeout || !lastActivity) { // !lastActivity means a scan was forced if (Setup.EPGScanTimeout || !lastActivity) { // !lastActivity means a scan was forced
time_t now = time(NULL); time_t now = time(NULL);
if (now - lastScan > ScanTimeout && now - lastActivity > ActivityTimeout) { if (now - lastScan > ScanTimeout && now - lastActivity > ActivityTimeout) {
if (Setup.EPGPauseAfterScan && !scanList && lastActivity && lastScan && now - lastScan < Setup.EPGScanTimeout * 3600) if (Setup.EPGPauseAfterScan && scanList->Count() == 0 && lastActivity && lastScan && now - lastScan < Setup.EPGScanTimeout * 3600)
return; // pause for Setup.EPGScanTimeout hours return; // pause for Setup.EPGScanTimeout hours
cStateKey StateKey; cStateKey StateKey;
if (const cChannels *Channels = cChannels::GetChannelsRead(StateKey, 10)) { if (const cChannels *Channels = cChannels::GetChannelsRead(StateKey, 10)) {
if (!scanList) { if (scanList->Count() == 0) {
scanList = new cScanList;
if (transponderList) { if (transponderList) {
scanList->AddTransponders(transponderList); scanList->AddTransponders(transponderList);
delete transponderList; delete transponderList;
@ -145,7 +144,6 @@ void cEITScanner::Process(void)
scanList->AddTransponders(Channels); scanList->AddTransponders(Channels);
//dsyslog("EIT scan: %d scanList entries", scanList->Count()); //dsyslog("EIT scan: %d scanList entries", scanList->Count());
} }
bool AnyDeviceSwitched = false;
for (int i = 0; i < cDevice::NumDevices(); i++) { for (int i = 0; i < cDevice::NumDevices(); i++) {
cDevice *Device = cDevice::GetDevice(i); cDevice *Device = cDevice::GetDevice(i);
if (Device && Device->ProvidesEIT()) { if (Device && Device->ProvidesEIT()) {
@ -171,7 +169,6 @@ void cEITScanner::Process(void)
//dsyslog("EIT scan: %d device %d source %-8s tp %5d", scanList->Count(), Device->DeviceNumber() + 1, *cSource::ToString(Channel->Source()), Channel->Transponder()); //dsyslog("EIT scan: %d device %d source %-8s tp %5d", scanList->Count(), Device->DeviceNumber() + 1, *cSource::ToString(Channel->Source()), Channel->Transponder());
Device->SwitchChannel(Channel, false); Device->SwitchChannel(Channel, false);
scanList->Del(ScanData); scanList->Del(ScanData);
AnyDeviceSwitched = true;
break; break;
} }
} }
@ -181,9 +178,7 @@ void cEITScanner::Process(void)
} }
} }
} }
if (!AnyDeviceSwitched) { if (scanList->Count() == 0) {
delete scanList;
scanList = NULL;
if (lastActivity == 0) // this was a triggered scan if (lastActivity == 0) // this was a triggered scan
Activity(); Activity();
} }