summaryrefslogtreecommitdiff
path: root/device.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <kls (at) cadsoft (dot) de>2006-09-03 18:00:00 +0200
committerKlaus Schmidinger <kls (at) cadsoft (dot) de>2006-09-03 18:00:00 +0200
commitc49ca5abb73cbc11447da5d961e106025dc927d0 (patch)
tree4faaa7168a60d1b4d4b468691bd7836263604248 /device.c
parent6d6df2fddd6da0ccc9fe9a9aa5526306e9db73d7 (diff)
downloadvdr-patch-lnbsharing-c49ca5abb73cbc11447da5d961e106025dc927d0.tar.gz
vdr-patch-lnbsharing-c49ca5abb73cbc11447da5d961e106025dc927d0.tar.bz2
Version 1.4.2-1vdr-1.4.2-1
- Added LC_ALL to the checks for UTF-8 at startup (suggested by Matthias Schwarzott). - Fixed the cTimer::operator=() so that it won't mess up the cListObject's pointers (reported by Alexander Rieger). - Fixed a memory leak in the cTimer::operator=() when using the 'aux' string (reported by Alexander Rieger). - Fixed processing the PDCDescriptor in 'libsi' on big endian systems (thanks to Martin Ostermann). - Fixed handling relative volume settings that unmute the audio in the call to cStatus::MsgSetVolume() (reported by Oliver Endriss).
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 c17cb0b..0fb4fc7 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;