frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed cReplayControl::Show() to avoid a compiler warning in g++ 3.2.3

Browse Source
This commit is contained in:
Klaus Schmidinger 2003-05-24 16:41:35 +02:00
parent 44dbfe9f38
commit faafa62587
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -581,6 +581,7 @@ Teemu Rantanen <tvr@iki.fi>
Jan Ekholm <chakie@infa.abo.fi> Jan Ekholm <chakie@infa.abo.fi>
for adding/improving some Swedish language OSD texts 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> Marcel Wiesweg <marcel.wiesweg@gmx.de>
for pointing out a problem with high CPU load during replay for pointing out a problem with high CPU load during replay

2
HISTORY
View File

@ -2195,3 +2195,5 @@ Video Disk Recorder Revision History
different transponder. If this fails, a channel up/down switch is attempted as 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 a fallback solution (thanks to Lauri Tischler for reporting this one, and to
Hermann Gausterer for suggesting to switch to the recording channel). 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).

11
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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" #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) if (modeOnly)
Hide(); Hide();
@ -3250,6 +3250,11 @@ void cReplayControl::Show(int Seconds)
} }
} }
void cReplayControl::Show(void)
{
ShowTimed();
}
void cReplayControl::Hide(void) void cReplayControl::Hide(void)
{ {
if (visible) { if (visible) {
@ -3447,7 +3452,7 @@ void cReplayControl::MarkToggle(void)
marks.Del(m); marks.Del(m);
else { else {
marks.Add(Current); marks.Add(Current);
Show(2); ShowTimed(2);
} }
marks.Save(); marks.Save();
} }

7
menu.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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 #ifndef __MENU_H
@ -50,7 +50,7 @@ class cDisplayVolume : public cOsdObject {
private: private:
int timeout; int timeout;
static cDisplayVolume *displayVolume; static cDisplayVolume *displayVolume;
void Show(void); virtual void Show(void);
cDisplayVolume(void); cDisplayVolume(void);
public: public:
virtual ~cDisplayVolume(); virtual ~cDisplayVolume();
@ -154,7 +154,7 @@ private:
void TimeSearchDisplay(void); void TimeSearchDisplay(void);
void TimeSearchProcess(eKeys Key); void TimeSearchProcess(eKeys Key);
void TimeSearch(void); void TimeSearch(void);
void Show(int Seconds = 0); void ShowTimed(int Seconds = 0);
static char *fileName; static char *fileName;
static char *title; static char *title;
void DisplayAtBottom(const char *s = NULL); void DisplayAtBottom(const char *s = NULL);
@ -169,6 +169,7 @@ public:
cReplayControl(void); cReplayControl(void);
virtual ~cReplayControl(); virtual ~cReplayControl();
virtual eOSState ProcessKey(eKeys Key); virtual eOSState ProcessKey(eKeys Key);
virtual void Show(void);
virtual void Hide(void); virtual void Hide(void);
bool Visible(void) { return visible; } bool Visible(void) { return visible; }
static void SetRecording(const char *FileName, const char *Title); static void SetRecording(const char *FileName, const char *Title);