frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed faulty behaviour of the 'Mute' key in case the channel display is visible

This commit is contained in:
Klaus Schmidinger 2003-03-30 10:53:22 +02:00
parent 0cc3bf2e6c
commit 64d0ed856b
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CONTRIBUTORS
View File

@ -556,3 +556,11 @@ Torsten Herz <torsten.herz@web.de>
Steffen Becker <stbecker@rbg.informatik.tu-darmstadt.de> Steffen Becker <stbecker@rbg.informatik.tu-darmstadt.de>
for reporting a problem with CPU load peaks (in the EPG scanner) for reporting a problem with CPU load peaks (in the EPG scanner)
Florian Bartels <Florian.Bartels@envisage.de>
for reporting a faulty behaviour of the "Mute" key in case the channel display
is visible
Sascha Volkenandt <sascha@akv-soft.de>
for helping to fix a faulty behaviour of the "Mute" key in case the channel display
is visible

3
HISTORY
View File

@ -1999,3 +1999,6 @@ Video Disk Recorder Revision History
- Made the log message "OSD window width must be a multiple of 4..." a debug message - Made the log message "OSD window width must be a multiple of 4..." a debug message
instead of an error message, so it can be avoided by using a log level less than 3. instead of an error message, so it can be avoided by using a log level less than 3.
- Updated Greek language texts (thanks to Dimitrios Dimitrakos). - Updated Greek language texts (thanks to Dimitrios Dimitrakos).
- Fixed faulty behaviour of the "Mute" key in case the channel display is visible
(thanks to Florian Bartels for reporting this one and Sascha Volkenandt for
helping to fix it).

7
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.cadsoft.de/people/kls/vdr * The project's page is at http://www.cadsoft.de/people/kls/vdr
* *
* $Id: vdr.c 1.146 2003/03/09 14:07:46 kls Exp $ * $Id: vdr.c 1.147 2003/03/30 10:43:58 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -530,14 +530,17 @@ int main(int argc, char *argv[])
case kVolDn: case kVolDn:
case kMute: case kMute:
if (key == kMute) { if (key == kMute) {
if (!cDevice::PrimaryDevice()->ToggleMute() && !Menu) if (!cDevice::PrimaryDevice()->ToggleMute() && !Menu) {
key = kNone; // nobody else needs to see these keys
break; // no need to display "mute off" break; // no need to display "mute off"
}
} }
else else
cDevice::PrimaryDevice()->SetVolume(NORMALKEY(key) == kVolDn ? -VOLUMEDELTA : VOLUMEDELTA); cDevice::PrimaryDevice()->SetVolume(NORMALKEY(key) == kVolDn ? -VOLUMEDELTA : VOLUMEDELTA);
if (!Interface->IsOpen()) if (!Interface->IsOpen())
Menu = Temp = cDisplayVolume::Create(); Menu = Temp = cDisplayVolume::Create();
cDisplayVolume::Process(key); cDisplayVolume::Process(key);
key = kNone; // nobody else needs to see these keys
break; break;
// Power off: // Power off:
case kPower: isyslog("Power button pressed"); case kPower: isyslog("Power button pressed");