summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2003-05-03 16:08:44 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2003-05-03 16:08:44 +0200
commit9e650825c2c651d2a23cc351516a336f5e237031 (patch)
tree0460790ce6ec91fe530b68f39f4faa272633d955
parentf1e5b591bd28c8acd852cad723459991c81d89b9 (diff)
downloadvdr-9e650825c2c651d2a23cc351516a336f5e237031.tar.gz
vdr-9e650825c2c651d2a23cc351516a336f5e237031.tar.bz2
The red ('Record') and yellow ('Pause') button in the 'Main' menu are no longer available when replaying
-rw-r--r--HISTORY2
-rw-r--r--menu.c8
2 files changed, 6 insertions, 4 deletions
diff --git a/HISTORY b/HISTORY
index 92a0b498..5e7b70e8 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2106,3 +2106,5 @@ Video Disk Recorder Revision History
- Removed the (no longer necessary) 'panic' stuff from cThread.
- Added cStatus::OsdItem() to provide the entire list of menu items to a plugin
(thanks to Carsten Siebholz).
+- The red ("Record") and yellow ("Pause") button in the "Main" menu are no longer
+ available when replaying.
diff --git a/menu.c b/menu.c
index 341480a5..7fc2f366 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.240 2003/04/27 12:50:31 kls Exp $
+ * $Id: menu.c 1.241 2003/05/03 15:59:07 kls Exp $
*/
#include "menu.h"
@@ -2489,7 +2489,7 @@ void cMenuMain::Set(const char *Plugin)
// Color buttons:
- SetHelp(tr("Record"), cDevice::PrimaryDevice()->NumAudioTracks() > 1 ? tr("Language") : NULL, replaying ? NULL : tr("Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Resume") : NULL);
+ SetHelp(!replaying ? tr("Record") : NULL, cDevice::PrimaryDevice()->NumAudioTracks() > 1 ? tr("Language") : NULL, replaying ? NULL : tr("Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Resume") : NULL);
Display();
lastActivity = time(NULL);
}
@@ -2547,7 +2547,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
default: switch (Key) {
case kRecord:
case kRed: if (!HadSubMenu)
- state = osRecord;
+ state = replaying ? osContinue : osRecord;
break;
case kGreen: if (!HadSubMenu) {
int CurrentAudioTrack = -1;
@@ -2564,7 +2564,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
}
break;
case kYellow: if (!HadSubMenu)
- state = osPause;
+ state = replaying ? osContinue : osPause;
break;
case kBlue: if (!HadSubMenu)
state = replaying ? osStopReplay : cReplayControl::LastReplayed() ? osReplay : osContinue;