From patchwork Tue Nov 29 17:20:44 2005
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: Klaus Schmidinger <Klaus.Schmidinger@cadsoft.de>
X-Patchwork-Id: 12106
Received: from tiger.cadsoft.de ([217.7.101.210])
	by www.linuxtv.org with esmtp (Exim 4.50) id 1Eh99t-0007gb-Jw
	for vdr@linuxtv.org; Tue, 29 Nov 2005 18:20:49 +0100
Received: from raven.cadsoft.de (raven.cadsoft.de [217.7.101.211])
	by tiger.cadsoft.de (8.12.7/8.12.7) with ESMTP id jATHKmh1028063
	for <vdr@linuxtv.org>; Tue, 29 Nov 2005 18:20:48 +0100
Received: from [192.168.100.10] (hawk.cadsoft.de [192.168.100.10])
	by raven.cadsoft.de (8.13.3/8.13.3) with ESMTP id jATHKlUB022122
	for <vdr@linuxtv.org>; Tue, 29 Nov 2005 18:20:47 +0100
Message-ID: <438C8DEC.5060509@cadsoft.de>
Date: Tue, 29 Nov 2005 18:20:44 +0100
From: Klaus Schmidinger <Klaus.Schmidinger@cadsoft.de>
Organization: CadSoft Computer GmbH
User-Agent: Mozilla Thunderbird 1.0.6 (X11/20050716)
X-Accept-Language: en
MIME-Version: 1.0
To: vdr@linuxtv.org
X-Greylist: Sender DNS name whitelisted, not delayed by milter-greylist-2.0
	(tiger.cadsoft.de [217.7.101.210]);
	Tue, 29 Nov 2005 18:20:48 +0100 (CET)
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0
	(raven.cadsoft.de [192.168.1.1]);
	Tue, 29 Nov 2005 18:20:48 +0100 (CET)
X-MIME-Autoconverted: from 8bit to quoted-printable by tiger.cadsoft.de id
	jATHKmh1028063
Subject: [vdr] Fix: no second APID or Dolby DIgital in live view with VDR
	1.3.37
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: VDR Mailing List <vdr@linuxtv.org>
List-Id: VDR Mailing List <vdr.linuxtv.org>
List-Unsubscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=unsubscribe>
List-Archive: <http://www.linuxtv.org/pipermail/vdr>
List-Post: <mailto:vdr@linuxtv.org>
List-Help: <mailto:vdr-request@linuxtv.org?subject=help>
List-Subscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Nov 2005 17:20:50 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 6404

The changes to CA handling in VDR 1.3.37 have broken the
second APID and live Dolby Digital on encrypted channels.

Here's a quick workaround for the problem:



Klaus

--- dvbdevice.c 2005/11/26 13:23:11     1.138
+++ dvbdevice.c 2005/11/29 17:08:35
@@ -825,6 +825,11 @@
          esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->Number(), CardIndex() + 1);
          return false;
          }
+     //XXX workaround for addition live audio PIDs:
+     if (ciHandler) {
+        ciHandler->SetPid(Channel->Apid(1), true);
+        ciHandler->SetPid(Channel->Dpid(0), true);
+        }
       if (IsPrimaryDevice())
          AddPid(Channel->Tpid(), ptTeletext);
       CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true)); // actually one would expect 'false' here, but according to Marco Schlüßler <marco@lordzodiac.de> this works