Falling back to 'stereo' when switching channels

3 files changed, 9 insertions, 1 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b9d520d5..932d0e57 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1223,3 +1223,7 @@ Marco Kremer <vdr.hgm.bg@gmx.net>
 
 Walter Koch <koch@u32.de>
  for adding channels for DVB-T Düsseldorf and Köln (Germany) to channels.cont.terr
+
+Rolf Groppe <rolf@groppe.de>
+ for suggesting to fall back to 'stereo' when switching channels in case the user
+ had switched to 'left' or 'right'
diff --git a/HISTORY b/HISTORY
index fc9eca92..bd078636 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3323,3 +3323,5 @@ Video Disk Recorder Revision History
 - Extended some buffer sizes to allow handling HDTV streams (thanks to Reinhard
   Nissl).
 - Added 'channels.conf.terr' entries for Düsseldorf and Köln (thanks to Walter Koch).
+- Falling back to 'stereo' when switching channels in case the user had switched
+  to 'left' or 'right' (suggested by Rolf Groppe).
diff --git a/device.c b/device.c
index 2cf9f0fd..27b82629 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 1.75 2005/01/16 14:48:52 kls Exp $
+ * $Id: device.c 1.76 2005/01/16 16:04:56 kls Exp $
  */
 
 #include "device.h"
@@ -569,6 +569,8 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
         const tTrackId *Track = GetTrack(GetCurrentAudioTrack());
         if (!Track || !Track->id || PreferredTrack != GetCurrentAudioTrack())
            SetCurrentAudioTrack(PreferredTrack);
+        // Fall back to stereo:
+        SetAudioChannel(0);
         }
      cStatus::MsgChannelSwitch(this, Channel->Number()); // only report status if channel switch successfull
      }