summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2006-01-15 15:06:19 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2006-01-15 15:06:19 +0100
commit806a7f6768d9ae149580ef754267df667f2f9fbd (patch)
tree1624d56fd97096ccf686de57d73c494aad3f58c2
parent408966aa0a7951fb71f5f0d29c87256b6041ae42 (diff)
downloadvdr-806a7f6768d9ae149580ef754267df667f2f9fbd.tar.gz
vdr-806a7f6768d9ae149580ef754267df667f2f9fbd.tar.bz2
No longer displaying color buttons in the recording info menu if it has been invoked from a player1.3.39
-rw-r--r--CONTRIBUTORS4
-rw-r--r--HISTORY2
-rw-r--r--menu.c21
3 files changed, 19 insertions, 8 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7de9d3f3..dadcf8c9 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1651,3 +1651,7 @@ Philippe Gramoullé <philippe@gramoulle.com>
André Weidemann <Andre.Weidemann@web.de>
for suggesting to only write Dolby Digital tracks into the 'info.vdr' file of a
recording if Setup.UseDolbyDigital is true
+
+Jürgen Schilling <juergen_schilling@web.de>
+ for reporting that color buttons were displayed in the recording info menu if it
+ has been invoked from a player
diff --git a/HISTORY b/HISTORY
index 85fd2413..3a657c0e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4187,3 +4187,5 @@ Video Disk Recorder Revision History
if Setup.UseDolbyDigital is true (suggested by André Weidemann).
- Added a leading '0' to the day in the DayDateTime() function (thanks to Rolf
Ahrenberg).
+- No longer displaying color buttons in the recording info menu if it has been
+ invoked from a player (reported by Jürgen Schilling).
diff --git a/menu.c b/menu.c
index ba0a7a03..dff19098 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.395 2006/01/15 13:35:05 kls Exp $
+ * $Id: menu.c 1.396 2006/01/15 15:02:36 kls Exp $
*/
#include "menu.h"
@@ -1702,17 +1702,19 @@ cOsdObject *CamControl(void)
class cMenuRecording : public cOsdMenu {
private:
const cRecording *recording;
+ bool withButtons;
public:
- cMenuRecording(const cRecording *Recording);
+ cMenuRecording(const cRecording *Recording, bool WithButtons = false);
virtual void Display(void);
virtual eOSState ProcessKey(eKeys Key);
};
-cMenuRecording::cMenuRecording(const cRecording *Recording)
+cMenuRecording::cMenuRecording(const cRecording *Recording, bool WithButtons)
:cOsdMenu(tr("Recording info"))
{
recording = Recording;
- if (recording)
+ withButtons = WithButtons;
+ if (withButtons)
SetHelp(tr("Button$Play"), tr("Button$Rewind"));
}
@@ -1744,8 +1746,11 @@ eOSState cMenuRecording::ProcessKey(eKeys Key)
if (state == osUnknown) {
switch (Key) {
- case kRed: Key = kOk; // will play the recording, even if recording commands are defined
- case kGreen: cRemote::Put(Key, true);
+ case kRed: if (withButtons)
+ Key = kOk; // will play the recording, even if recording commands are defined
+ case kGreen: if (!withButtons)
+ break;
+ cRemote::Put(Key, true);
// continue with osBack to close the info menu and process the key
case kOk: return osBack;
default: break;
@@ -1993,7 +1998,7 @@ eOSState cMenuRecordings::Info(void)
if (ri && !ri->IsDirectory()) {
cRecording *recording = GetRecording(ri);
if (recording && recording->Info()->Title())
- return AddSubMenu(new cMenuRecording(recording));
+ return AddSubMenu(new cMenuRecording(recording, true));
}
return osContinue;
}
@@ -3993,7 +3998,7 @@ cOsdObject *cReplayControl::GetInfo(void)
{
cRecording *Recording = Recordings.GetByName(cReplayControl::LastReplayed());
if (Recording)
- return new cMenuRecording(Recording);
+ return new cMenuRecording(Recording, false);
return NULL;
}