Fixed cDevice::ToggleMute()

This commit is contained in:
Klaus Schmidinger 2006-07-29 10:17:35 +02:00
parent afb7ae3295
commit cdad4a6b4e
3 changed files with 5 additions and 3 deletions

View File

@ -1873,6 +1873,7 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
the jump instead of closing the display the jump instead of closing the display
for reporting that the log message "deleting plugin: ..." is irritating when for reporting that the log message "deleting plugin: ..." is irritating when
calling "vdr --help" calling "vdr --help"
for fixing cDevice::ToggleMute()
Pekka Mauno <pekka.mauno@iki.fi> Pekka Mauno <pekka.mauno@iki.fi>
for fixing cSchedule::GetFollowingEvent() in case there is currently no present for fixing cSchedule::GetFollowingEvent() in case there is currently no present

View File

@ -4841,3 +4841,4 @@ Video Disk Recorder Revision History
(thanks to Frank Schmirler). (thanks to Frank Schmirler).
- Increased the APIVERSION to allow plugins that relied on the cStatus::MsgSetVolume() - Increased the APIVERSION to allow plugins that relied on the cStatus::MsgSetVolume()
bug to react properly (suggested by Stefan Huelswitt). bug to react properly (suggested by Stefan Huelswitt).
- Fixed cDevice::ToggleMute() (thanks to Christoph Haubrich).

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: device.c 1.133 2006/07/22 14:06:11 kls Exp $ * $Id: device.c 1.134 2006/07/29 10:03:56 kls Exp $
*/ */
#include "device.h" #include "device.h"
@ -751,12 +751,12 @@ bool cDevice::ToggleMute(void)
mute = !mute; mute = !mute;
//XXX why is it necessary to use different sequences??? //XXX why is it necessary to use different sequences???
if (mute) { if (mute) {
SetVolume(0, mute); SetVolume(0, true);
Audios.MuteAudio(mute); // Mute external audio after analog audio Audios.MuteAudio(mute); // Mute external audio after analog audio
} }
else { else {
Audios.MuteAudio(mute); // Enable external audio before analog audio Audios.MuteAudio(mute); // Enable external audio before analog audio
SetVolume(0, mute); SetVolume(OldVolume, true);
} }
volume = OldVolume; volume = OldVolume;
return mute; return mute;