summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS2
-rw-r--r--HISTORY2
-rw-r--r--menu.c6
3 files changed, 7 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7dfef151..30104f33 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2544,6 +2544,8 @@ Ulf Kiener <webmaster@ulf-kiener.de>
for suggesting to add user defined key kUser0
for suggesting to perform absolute jumps when replaying a recording (via the Red key)
only if an actual value has been entered
+ for suggesting to make the Yellow button in the main menu not act as "Pause" if
+ "Pause key handling" is set to "do not pause live video"
Jörg Wendel <vdr-ml@jwendel.de>
for reporting that cPlugin::Active() was called too often
diff --git a/HISTORY b/HISTORY
index 1ec039f6..f216ac1f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7836,3 +7836,5 @@ Video Disk Recorder Revision History
- Unified the internal sequence of actions when pressing the Blue and the Back key,
respectively, during replay (reported by Thomas Maass).
+- The Yellow button in the main menu no longer acts as "Pause" if "Pause key handling"
+ is set to "do not pause live video" (suggested by Ulf Kiener).
diff --git a/menu.c b/menu.c
index 7bccfe8c..e0b2438a 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 2.82.1.3 2013/09/07 10:24:48 kls Exp $
+ * $Id: menu.c 2.82.1.4 2013/09/07 12:53:34 kls Exp $
*/
#include "menu.h"
@@ -3448,7 +3448,7 @@ bool cMenuMain::Update(bool Force)
stopReplayItem = NULL;
}
// Color buttons:
- SetHelp(!replaying ? tr("Button$Record") : NULL, tr("Button$Audio"), replaying ? NULL : tr("Button$Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Button$Resume") : tr("Button$Play"));
+ SetHelp(!replaying ? tr("Button$Record") : NULL, tr("Button$Audio"), replaying || !Setup.PauseKeyHandling ? NULL : tr("Button$Pause"), replaying ? tr("Button$Stop") : cReplayControl::LastReplayed() ? tr("Button$Resume") : tr("Button$Play"));
result = true;
}
@@ -3543,7 +3543,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key)
}
break;
case kYellow: if (!HadSubMenu)
- state = replaying ? osContinue : osPause;
+ state = replaying || !Setup.PauseKeyHandling ? osContinue : osPause;
break;
case kBlue: if (!HadSubMenu)
state = replaying ? osStopReplay : cReplayControl::LastReplayed() ? osReplay : osRecordings;