From 7f244d5c9c6a176bd1008f0ea10c9649dba7c1a9 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Tue, 8 Feb 2005 14:18:18 +0100 Subject: Fixed handling Transfer Mode for radio channels --- CONTRIBUTORS | 1 + HISTORY | 2 ++ dvbdevice.c | 6 +++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index ed5bf49b..ea353802 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1044,6 +1044,7 @@ Andreas Regel video directory is empty for pointing out a missing call to cStatus::MsgOsdtatusMessage(NULL) in cSkins::Message() + for reporting a problem in handling Transfer Mode for radio channels Thomas Bergwinkl for fixing the validity check for channel IDs, because some providers use TIDs diff --git a/HISTORY b/HISTORY index c864a5d5..73a342d8 100644 --- a/HISTORY +++ b/HISTORY @@ -3382,3 +3382,5 @@ Video Disk Recorder Revision History permanently returns 0 (thanks to Reinhard Nissl and Olaf Titz). - Completed the Finnish OSD texts (thanks to Rolf Ahrenberg). - Restricted the "setting audio track" log message to automatic changes during replay. +- Fixed handling Transfer Mode for radio channels (thanks to Andreas Regel for + reporting this one). diff --git a/dvbdevice.c b/dvbdevice.c index 2e15ce1d..5659c515 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.118 2005/02/08 11:20:30 kls Exp $ + * $Id: dvbdevice.c 1.119 2005/02/08 14:07:16 kls Exp $ */ #include "dvbdevice.h" @@ -768,8 +768,8 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView) ); bool StartTransferMode = IsPrimaryDevice() && !IsEncrypted && !DoTune - && (LiveView && HasPid(Channel->Vpid()) && pidHandles[ptVideo].pid != Channel->Vpid() // the PID is already set as DMX_PES_OTHER - || !LiveView && pidHandles[ptVideo].pid == Channel->Vpid() // a recording is going to shift the PIDs from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER + && (LiveView && HasPid(Channel->Vpid() ? Channel->Vpid() : Channel->Apid(0)) && (pidHandles[ptVideo].pid != Channel->Vpid() || pidHandles[ptAudio].pid != Channel->Apid(0))// the PID is already set as DMX_PES_OTHER + || !LiveView && (pidHandles[ptVideo].pid == Channel->Vpid() || pidHandles[ptAudio].pid == Channel->Apid(0)) // a recording is going to shift the PIDs from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER ); bool TurnOnLivePIDs = HasDecoder() && !StartTransferMode -- cgit v1.2.3