summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2002-03-09 10:16:16 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2002-03-09 10:16:16 +0100
commiteb89599c58b186c38f66146c5635f20cec5c8112 (patch)
tree4c02642461d60a8db3b707221abc1d14c63ba6f2
parent18ab84b0c108763f6c591abdbea228faabfdea1c (diff)
downloadvdr-eb89599c58b186c38f66146c5635f20cec5c8112.tar.gz
vdr-eb89599c58b186c38f66146c5635f20cec5c8112.tar.bz2
Fixed resetting 'mute' state when setting the volume to a non-zero value
-rw-r--r--HISTORY1
-rw-r--r--dvbapi.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 93d27d9e..e111e221 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1080,3 +1080,4 @@ Video Disk Recorder Revision History
startup (suggested by Mirko Günther).
- The new SVDRP command VOLU can be used to control the audio volume (suggested
by Mirko Günther).
+- Fixed resetting 'mute' state when setting the volume to a non-zero value.
diff --git a/dvbapi.c b/dvbapi.c
index f47ac937..dd009369 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbapi.c 1.158 2002/03/08 16:31:23 kls Exp $
+ * $Id: dvbapi.c 1.159 2002/03/09 10:14:07 kls Exp $
*/
#include "dvbapi.h"
@@ -2717,6 +2717,8 @@ void cDvbApi::SetVolume(int Volume, bool Absolute)
audioMixer_t am;
am.volume_left = am.volume_right = volume;
CHECK(ioctl(fd_audio, AUDIO_SET_MIXER, &am));
+ if (volume > 0)
+ mute = false;
}
}