summaryrefslogtreecommitdiff
path: root/eitscan.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2005-11-05 15:48:05 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2005-11-05 15:48:05 +0100
commit27ab07e80d2855b63e2d1df700bc307699fed6fb (patch)
tree0991809bc9a79ff235d93eeee1b593afbf0e4b4d /eitscan.c
parent596e965a5334fec97b4ee4fd19223b6acfacf680 (diff)
downloadvdr-27ab07e80d2855b63e2d1df700bc307699fed6fb.tar.gz
vdr-27ab07e80d2855b63e2d1df700bc307699fed6fb.tar.bz2
The EPG scan no longer disturbs players that have also set live PIDs
Diffstat (limited to 'eitscan.c')
-rw-r--r--eitscan.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/eitscan.c b/eitscan.c
index 10739c31..7a89141b 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: eitscan.c 1.28 2005/08/26 15:37:06 kls Exp $
+ * $Id: eitscan.c 1.29 2005/11/05 15:24:36 kls Exp $
*/
#include "eitscan.h"
@@ -150,13 +150,14 @@ void cEITScanner::Process(void)
if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= 0x0100) {
if (Device->ProvidesTransponder(Channel)) {
if (!Device->Receiving()) {
- bool IsPrimaryDeviceReplaying = Device == cDevice::PrimaryDevice() && Device->Replaying() && cTransferControl::ReceiverDevice() != cDevice::PrimaryDevice();
- if (Device != cDevice::ActualDevice() || (Device->ProvidesTransponderExclusively(Channel) && (IsPrimaryDeviceReplaying || now - lastActivity > Setup.EPGScanTimeout * 3600))) {
- if (!IsPrimaryDeviceReplaying && Device == cDevice::ActualDevice() && !currentChannel) {
- if (cTransferControl::ReceiverDevice())
+ bool MaySwitchTransponder = Device->MaySwitchTransponder();
+ if (MaySwitchTransponder || Device->ProvidesTransponderExclusively(Channel) && now - lastActivity > Setup.EPGScanTimeout * 3600) {
+ if (!MaySwitchTransponder) {
+ if (Device == cDevice::ActualDevice() && !currentChannel) {
cDevice::PrimaryDevice()->StopReplay(); // stop transfer mode
- currentChannel = Device->CurrentChannel();
- Skins.Message(mtInfo, tr("Starting EPG scan"));
+ currentChannel = Device->CurrentChannel();
+ Skins.Message(mtInfo, tr("Starting EPG scan"));
+ }
}
currentDevice = Device;//XXX see also dvbdevice.c!!!
//dsyslog("EIT scan: device %d source %-8s tp %5d", Device->DeviceNumber() + 1, *cSource::ToString(Channel->Source()), Channel->Transponder());