From patchwork Sun Mar 6 19:44:51 2005 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "C.Y.M" X-Patchwork-Id: 11800 Received: from dialup-4.245.117.203.dial1.sanjose1.level3.net ([4.245.117.203] helo=nofear.bounceme.net) by www.linuxtv.org with esmtp (Exim 4.34) id 1D81dc-0004rT-92 for vdr@linuxtv.org; Sun, 06 Mar 2005 20:42:07 +0100 Received: from [10.1.1.66] (hades [10.1.1.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by nofear.bounceme.net (Postfix) with ESMTP id 0D03273BF1 for ; Sun, 6 Mar 2005 11:41:38 -0800 (PST) Message-ID: <422B5DB3.4020603@syphir.sytes.net> Date: Sun, 06 Mar 2005 11:44:51 -0800 From: "C.Y.M" Organization: CooLNeT User-Agent: Mozilla Thunderbird 0.8 (Windows/20040913) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Vdr X-Enigmail-Version: 0.86.1.0 X-Enigmail-Supports: pgp-inline, pgp-mime Subject: [vdr] Allow recording of encrpted and FTA channel simultaneously X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: syphir@syphir.sytes.net, Klaus Schmidinger's VDR List-Id: Klaus Schmidinger's VDR List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Mar 2005 19:42:10 -0000 Status: O X-Status: X-Keywords: X-UID: 549 Since it is only possible to view one encrypted channel per card, this patch allows vdr to record both an encrypted and a FTA channel, simultaneously, using a single dvb card. Regards, --- vdr-1.3.22/dvbdevice.c.orig 2005-03-06 11:17:04.000000000 -0800 +++ vdr-1.3.22/dvbdevice.c 2005-03-06 11:21:15.000000000 -0800 @@ -907,9 +907,8 @@ if (dvbTuner->IsTunedTo(Channel)) { if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid(0) && !HasPid(Channel->Apid(0))) { #ifdef DO_MULTIPLE_RECORDINGS - if (Ca() > CACONFBASE || Channel->Ca() > CACONFBASE) - needsDetachReceivers = !ciHandler // only LL-firmware can do non-live CA channels - || Ca() != Channel->Ca(); + if (Ca() > CACONFBASE && Channel->Ca() > CACONFBASE) + needsDetachReceivers = true; // only LL-firmware can do non-live CA channels else if (!IsPrimaryDevice()) result = true; #ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE