From bcacfad0572fc3c726e74ab6fba4bee228e5365d Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 19 Mar 2006 12:37:03 +0100 Subject: [PATCH] Fixed cDvbDevice::SetAudioBypass() in case setTransferModeForDolbyDigital is false --- CONTRIBUTORS | 2 ++ HISTORY | 2 ++ dvbdevice.c | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 11bd25dd..1ea79eec 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -307,6 +307,8 @@ Werner Fink for enabling a device to detach all receivers for a given PID for modifying switching to Dolby Digital audio in live mode, if the driver and firmware can handle live DD without the need of a Transfer Mode + for fixing cDvbDevice::SetAudioBypass() in case setTransferModeForDolbyDigital is + false Rolf Hakenes for providing 'libdtv' and adapting the EIT mechanisms to it diff --git a/HISTORY b/HISTORY index efe581a1..874835f2 100644 --- a/HISTORY +++ b/HISTORY @@ -4426,3 +4426,5 @@ Video Disk Recorder Revision History Christoph Haubrich for reporting that this is irritating when calling "vdr --help"). - Fixed cReadLine::Read() for lines that end with the infamous "\r\n" (thanks to Rolf Ahrenberg). +- Fixed cDvbDevice::SetAudioBypass() in case setTransferModeForDolbyDigital is false + (thanks to Werner Fink). diff --git a/dvbdevice.c b/dvbdevice.c index 148a12a5..a722be99 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.153 2006/02/19 13:52:04 kls Exp $ + * $Id: dvbdevice.c 1.154 2006/03/19 12:34:24 kls Exp $ */ #include "dvbdevice.h" @@ -653,6 +653,8 @@ eVideoSystem cDvbDevice::GetVideoSystem(void) bool cDvbDevice::SetAudioBypass(bool On) { + if (!setTransferModeForDolbyDigital) + return false; return ioctl(fd_audio, AUDIO_SET_BYPASS_MODE, On) == 0; }