summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY2
-rw-r--r--menu.c11
-rw-r--r--menu.h7
4 files changed, 15 insertions, 6 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 3a62501a..515ffe36 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -581,6 +581,7 @@ Teemu Rantanen <tvr@iki.fi>
Jan Ekholm <chakie@infa.abo.fi>
for adding/improving some Swedish language OSD texts
+ for reporting a compiler warning in g++ 3.2.3 regarding cReplayControl::Show()
Marcel Wiesweg <marcel.wiesweg@gmx.de>
for pointing out a problem with high CPU load during replay
diff --git a/HISTORY b/HISTORY
index 3f41ffc2..be1ec659 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2195,3 +2195,5 @@ Video Disk Recorder Revision History
different transponder. If this fails, a channel up/down switch is attempted as
a fallback solution (thanks to Lauri Tischler for reporting this one, and to
Hermann Gausterer for suggesting to switch to the recording channel).
+- Fixed cReplayControl::Show() to avoid a compiler warning in g++ 3.2.3 (thanks
+ to Jan Ekholm for reporting this one).
diff --git a/menu.c b/menu.c
index f4c58b35..b46b0055 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.245 2003/05/16 12:40:12 kls Exp $
+ * $Id: menu.c 1.246 2003/05/24 16:35:34 kls Exp $
*/
#include "menu.h"
@@ -3240,7 +3240,7 @@ void cReplayControl::ClearLastReplayed(const char *FileName)
}
}
-void cReplayControl::Show(int Seconds)
+void cReplayControl::ShowTimed(int Seconds)
{
if (modeOnly)
Hide();
@@ -3250,6 +3250,11 @@ void cReplayControl::Show(int Seconds)
}
}
+void cReplayControl::Show(void)
+{
+ ShowTimed();
+}
+
void cReplayControl::Hide(void)
{
if (visible) {
@@ -3447,7 +3452,7 @@ void cReplayControl::MarkToggle(void)
marks.Del(m);
else {
marks.Add(Current);
- Show(2);
+ ShowTimed(2);
}
marks.Save();
}
diff --git a/menu.h b/menu.h
index a4045057..5dd40806 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menu.h 1.55 2003/05/11 13:43:58 kls Exp $
+ * $Id: menu.h 1.56 2003/05/24 16:35:52 kls Exp $
*/
#ifndef __MENU_H
@@ -50,7 +50,7 @@ class cDisplayVolume : public cOsdObject {
private:
int timeout;
static cDisplayVolume *displayVolume;
- void Show(void);
+ virtual void Show(void);
cDisplayVolume(void);
public:
virtual ~cDisplayVolume();
@@ -154,7 +154,7 @@ private:
void TimeSearchDisplay(void);
void TimeSearchProcess(eKeys Key);
void TimeSearch(void);
- void Show(int Seconds = 0);
+ void ShowTimed(int Seconds = 0);
static char *fileName;
static char *title;
void DisplayAtBottom(const char *s = NULL);
@@ -169,6 +169,7 @@ public:
cReplayControl(void);
virtual ~cReplayControl();
virtual eOSState ProcessKey(eKeys Key);
+ virtual void Show(void);
virtual void Hide(void);
bool Visible(void) { return visible; }
static void SetRecording(const char *FileName, const char *Title);