From 65b9d4a97f3a00865f8d578635f8ac2947c62cbb Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 27 Apr 2003 09:45:51 +0200
Subject: [PATCH] Removed the Mute() call from cDvbDevice::StillPicture()

---
 CONTRIBUTORS | 1 +
 HISTORY      | 4 +++-
 dvbdevice.c  | 5 ++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 196bf0cd..f29bfb9c 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -199,6 +199,7 @@ Andreas Schultz <aschultz@warp10.net>
  cMenuRecordings::Del(), which caused warnings with gcc-3.2
  for suggesting a Make.config file
  for making EIT filtering use masks to reduce the number of filters
+ for suggesting to remove the Mute() call from cDvbDevice::StillPicture()
 
 Aaron Holtzman
  for writing 'ac3dec'
diff --git a/HISTORY b/HISTORY
index 05b0de13..06fe9d87 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2054,7 +2054,7 @@ Video Disk Recorder Revision History
   your remote control while watching live video to start an instant recording
   of the current programme and immediately start replaying that recording.
 
-2003-04-26: Version 1.1.29
+2003-04-27: Version 1.1.29
 
 - Fixed detecting broken connection to the LIRC daemon (thanks to Ludwig Nussel).
 - Now sending CA descriptors to the CAM in the same sequence as they were originally
@@ -2069,3 +2069,5 @@ Video Disk Recorder Revision History
   live video (thanks to Christoph Friederich for reporting this one).
 - Now setting the "broken link" flag for GOPs at the beginning of a new video
   sequence, which avoids artefacts when cutting (thanks to Stefan Huelswitt).
+- Removed the Mute() call from cDvbDevice::StillPicture() (suggested by Andreas
+  Schultz).
diff --git a/dvbdevice.c b/dvbdevice.c
index 32c5b9e6..d66cd767 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.55 2003/04/26 11:49:06 kls Exp $
+ * $Id: dvbdevice.c 1.56 2003/04/27 09:44:17 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -871,7 +871,6 @@ void cDvbDevice::Mute(void)
 
 void cDvbDevice::StillPicture(const uchar *Data, int Length)
 {
-  Mute();
 /* Using the VIDEO_STILLPICTURE ioctl call would be the
    correct way to display a still frame, but unfortunately this
    doesn't work with frames from VDR. So let's do pretty much the
@@ -883,7 +882,7 @@ void cDvbDevice::StillPicture(const uchar *Data, int Length)
 */
 //#define VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES
 #ifdef VIDEO_STILLPICTURE_WORKS_WITH_VDR_FRAMES
-  videoDisplayStillPicture sp = { (char *)Data, Length };
+  video_still_picture sp = { (char *)Data, Length };
   CHECK(ioctl(fd_video, VIDEO_STILLPICTURE, &sp));
 #else
 #define MIN_IFRAME 400000