summaryrefslogtreecommitdiff
path: root/device.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2006-09-03 11:49:32 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2006-09-03 11:49:32 +0200
commit5ff1d3571199dfa412e8e1cb7eb2a4f920fdbdd5 (patch)
tree35e88e25048e65cd03c2e23652d1ce837e35215f /device.c
parent2e97eed6ad98aee6a0058b18e46b9b3430454d86 (diff)
downloadvdr-5ff1d3571199dfa412e8e1cb7eb2a4f920fdbdd5.tar.gz
vdr-5ff1d3571199dfa412e8e1cb7eb2a4f920fdbdd5.tar.bz2
Fixed handling relative volume settings that unmute the audio in the call to cStatus::MsgSetVolume()1.4.2-1
Diffstat (limited to 'device.c')
-rw-r--r--device.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/device.c b/device.c
index c17cb0b5..0fb4fc75 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.136 2006/08/26 14:11:03 kls Exp $
+ * $Id: device.c 1.137 2006/09/03 10:13:25 kls Exp $
*/
#include "device.h"
@@ -779,6 +779,7 @@ void cDevice::SetVolume(int Volume, bool Absolute)
int OldVolume = volume;
volume = min(max(Absolute ? Volume : volume + Volume, 0), MAXVOLUME);
SetVolumeDevice(volume);
+ Absolute |= mute;
cStatus::MsgSetVolume(Absolute ? volume : volume - OldVolume, Absolute);
if (volume > 0) {
mute = false;