From 1d1b2f12758ce3ab87e924a84d83c8a176c0ca3a Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Fri, 14 Jan 2005 14:28:47 +0100 Subject: [PATCH] The "Green" button in the "Main" menu is now always "Audio" --- HISTORY | 2 ++ menu.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/HISTORY b/HISTORY index 61e6756a..0f94df8f 100644 --- a/HISTORY +++ b/HISTORY @@ -3301,3 +3301,5 @@ Video Disk Recorder Revision History - Made cCondWait::SleepMs() sleep at least 3ms to avoid a possible busy wait. - Fixed canceling the LIRC thread (thanks to Marco Schlüßler for pointing out this one). +- The "Green" button in the "Main" menu is now always "Audio", since the audio + channel might be changed even if there is only one actual audio PID. diff --git a/menu.c b/menu.c index 49f56105..c8a28340 100644 --- a/menu.c +++ b/menu.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 1.335 2005/01/14 13:13:58 kls Exp $ + * $Id: menu.c 1.336 2005/01/14 14:27:29 kls Exp $ */ #include "menu.h" @@ -2452,7 +2452,7 @@ void cMenuMain::Set(const char *Plugin) // Color buttons: - SetHelp(!replaying ? tr("Record") : NULL, cDevice::PrimaryDevice()->NumAudioTracks() > 1 ? tr("Audio") : NULL, replaying ? NULL : tr("Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Resume") : NULL); + SetHelp(!replaying ? tr("Record") : NULL, tr("Audio"), replaying ? NULL : tr("Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Resume") : NULL); Display(); lastActivity = time(NULL); }