From c94b4a803cfe16c8e26e570d455a8713f2b82798 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Thu, 27 Feb 2014 17:12:14 +0100 Subject: Fixed handling transfer mode on full featured DVB cards for encrypted channels that have no audio pid --- CONTRIBUTORS | 4 ++++ HISTORY | 4 +++- PLUGINS/src/dvbsddevice/dvbsdffdevice.c | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 3a4c75e6..ef03fc56 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -3208,3 +3208,7 @@ Christian Paulick Mariusz Bialonczyk for reporting that acquiring the CA descriptors takes way too long on transponders with many PAT entries, and his help in debugging this + +Christian Winkler + for reporting a problem with transfer mode on full featured DVB cards for encrypted + channels that have no audio pid diff --git a/HISTORY b/HISTORY index e38aa620..5dfce4f2 100644 --- a/HISTORY +++ b/HISTORY @@ -7870,7 +7870,7 @@ Video Disk Recorder Revision History and also to use the correct directory with --edit (the latter reported by Marko Mäkelä). -2014-02-26: Version 2.0.6 +2014-02-27: Version 2.0.6 - Updated 'sources.conf' (thanks to Antti Hartikainen). - cFont::CreateFont() now returns a dummy font in case there are no fonts installed. @@ -7898,3 +7898,5 @@ Video Disk Recorder Revision History - Fixed handling frame detection buffer length (reported by Eike Sauer). - Fixed keeping the current position in the Recordings menu if a recording was deleted in a sub folder. +- Fixed handling transfer mode on full featured DVB cards for encrypted channels + that have no audio pid (reported by Christian Winkler). diff --git a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c index 4e98cdda..8dd69c21 100644 --- a/PLUGINS/src/dvbsddevice/dvbsdffdevice.c +++ b/PLUGINS/src/dvbsddevice/dvbsdffdevice.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: dvbsdffdevice.c 2.35 2013/02/17 13:16:18 kls Exp $ + * $Id: dvbsdffdevice.c 2.35.1.1 2014/02/27 17:10:51 kls Exp $ */ #include "dvbsdffdevice.h" @@ -400,8 +400,8 @@ bool cDvbSdFfDevice::SetChannelDevice(const cChannel *Channel, bool LiveView) bool DoTune = !IsTunedToTransponder(Channel); - bool pidHandlesVideo = pidHandles[ptVideo].pid == vpid; - bool pidHandlesAudio = pidHandles[ptAudio].pid == apid; + bool pidHandlesVideo = vpid && pidHandles[ptVideo].pid == vpid; + bool pidHandlesAudio = apid && pidHandles[ptAudio].pid == apid; bool TurnOffLivePIDs = DoTune || !IsPrimaryDevice() -- cgit v1.2.3