From 70ea2cbbd1d9b393486c01632716124ca7e55b27 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 19 Jun 2004 13:48:25 +0200 Subject: [PATCH] Fixed switching channels while an encrypted channel is being recorded (cont'd) --- HISTORY | 3 ++- dvbdevice.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/HISTORY b/HISTORY index 1c67855f..2228a7f3 100644 --- a/HISTORY +++ b/HISTORY @@ -2914,7 +2914,8 @@ Video Disk Recorder Revision History a problem with long event texts in the "Classic VDR" skin). - Fixed switching channels while an encrypted channel is being recorded, because the channel was switched if the new channel was on the same transponder and was - a radio channel (thanks to Martin Dauskardt for reporting this one). + a radio channel or an unencrypted channel (thanks to Martin Dauskardt for reporting + this one). - No longer using the external 'find' command to scan the video directory for recordings (based on a suggestion by Mirko Dölle). - The list of recordings is now kept statically in memory to avoid long delays diff --git a/dvbdevice.c b/dvbdevice.c index 2f43bc8c..04af94b9 100644 --- a/dvbdevice.c +++ b/dvbdevice.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbdevice.c 1.92 2004/06/19 08:52:24 kls Exp $ + * $Id: dvbdevice.c 1.93 2004/06/19 13:48:00 kls Exp $ */ #include "dvbdevice.h" @@ -684,7 +684,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne if (dvbTuner->IsTunedTo(Channel)) { if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid1() && !HasPid(Channel->Apid1())) { #ifdef DO_MULTIPLE_RECORDINGS - if (Channel->Ca() > CACONFBASE) + if (Ca() > CACONFBASE || Channel->Ca() > CACONFBASE) needsDetachReceivers = !ciHandler // only LL-firmware can do non-live CA channels || Ca() != Channel->Ca(); else if (!IsPrimaryDevice())