From 23ed5a5ed3824b01cbf66699ff0b34f72ddb9826 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 14 Nov 2004 18:00:00 +0100
Subject: =?UTF-8?q?Version=201.3.16=20-=20Fixed=20cChannel::SetName()=20in?=
 =?UTF-8?q?=20case=20only=20the=20ShortName=20or=20Provider=20has=20change?=
 =?UTF-8?q?d=20=20=20(thanks=20to=20Sascha=20Volkenandt=20for=20reporting?=
 =?UTF-8?q?=20this=20one).=20-=20Added=20Danish=20language=20texts=20(than?=
 =?UTF-8?q?ks=20to=20Mogens=20Elneff).=20-=20Reactivated=20the=20NPTL=20ch?=
 =?UTF-8?q?eck=20at=20startup=20because=20there=20appear=20to=20be=20still?=
 =?UTF-8?q?=20=20=20unsolved=20problems=20when=20running=20on=20NPTL=20sys?=
 =?UTF-8?q?tems.=20-=20Added=20missing=20calls=20to=20cStatus::MsgOsdClear?=
 =?UTF-8?q?()=20in=20cSkins::Message()=20(thanks=20=20=20to=20Joachim=20Wi?=
 =?UTF-8?q?lke=20for=20reporting=20this=20one,=20and=20Andreas=20Regel=20f?=
 =?UTF-8?q?or=20additional=20=20=20input).=20-=20Fixed=20the=20cDvbSpuDeco?=
 =?UTF-8?q?der=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20Fixed?=
 =?UTF-8?q?=20handling=20of=20pmAudioOnlyBlack=20(thanks=20to=20Stefan=20H?=
 =?UTF-8?q?uelswitt).=20-=20Fixed=20a=20short=20glitch=20when=20starting?=
 =?UTF-8?q?=20a=20recording=20on=20the=20primary=20device=20while=20=20=20?=
 =?UTF-8?q?in=20replay=20or=20transfer=20mode=20(thanks=20to=20Marco=20Sch?=
 =?UTF-8?q?l=C3=BC=C3=9Fler).=20-=20Added=20missing=20initialization=20of?=
 =?UTF-8?q?=20cEvent::seen.=20-=20Checking=20PID=20language=20codes=20for?=
 =?UTF-8?q?=20ISO=20639=20compliance=20to=20avoid=20problems=20with=20=20?=
 =?UTF-8?q?=20funny=20characters.=20Invalid=20language=20codes=20will=20be?=
 =?UTF-8?q?=20stored=20as=20"=3F=3F=3F".=20-=20The=20'0'=20key=20now=20tog?=
 =?UTF-8?q?gles=20the=20"Day"=20item=20in=20the=20"Timers"=20menu=20betwee?=
 =?UTF-8?q?n=20"single=20=20=20shot"=20and=20"repeating".=20The=20keys=20'?=
 =?UTF-8?q?1'...'7'=20can=20be=20used=20to=20toggle=20the=20individual=20?=
 =?UTF-8?q?=20=20days=20('1'=20is=20Monday).=20Thanks=20to=20Sascha=20Klek?=
 =?UTF-8?q?=20for=20reporting=20a=20problem=20with=20the=20=20=20'0'=20key?=
 =?UTF-8?q?=20in=20the=20"Day"=20item=20of=20the=20"Timers"=20menu.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dvbdevice.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'dvbdevice.c')

diff --git a/dvbdevice.c b/dvbdevice.c
index fb87ae4..2702f95 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.102 2004/10/30 14:53:30 kls Exp $
+ * $Id: dvbdevice.c 1.104 2004/11/07 10:27:19 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -681,14 +681,15 @@ int cDvbDevice::OpenFilter(u_short Pid, u_char Tid, u_char Mask)
   return -1;
 }
 
-void cDvbDevice::TurnOffLiveMode(void)
+void cDvbDevice::TurnOffLiveMode(bool LiveView)
 {
-  // Avoid noise while switching:
-
-  CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true));
-  CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
-  CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
-  CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
+  if (LiveView) {
+     // Avoid noise while switching:
+     CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true));
+     CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
+     CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER));
+     CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER));
+     }
 
   // Turn off live PIDs:
 
@@ -781,7 +782,7 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
   // Turn off live PIDs if necessary:
 
   if (TurnOffLivePIDs)
-     TurnOffLiveMode();
+     TurnOffLiveMode(LiveView);
 
   // Set the tuner:
 
@@ -897,10 +898,9 @@ bool cDvbDevice::SetPlayMode(ePlayMode PlayMode)
          CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false));
          break;
     case pmAudioVideo:
-         if (playMode == pmNone)
-            TurnOffLiveMode();
-         // continue with next...
     case pmAudioOnlyBlack:
+         if (playMode == pmNone)
+            TurnOffLiveMode(true);
          CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true));
          CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_MEMORY));
          CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, PlayMode == pmAudioVideo));
-- 
cgit v1.2.3