1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Changed cMenuRecordings::Del() to cMenuRecordings::Delete() to avoid a warning in gcc-3.2

This commit is contained in:
Klaus Schmidinger 2002-10-06 10:40:27 +02:00
parent 53407825f9
commit b7d3273d92
4 changed files with 10 additions and 8 deletions

View File

@ -176,7 +176,8 @@ Andreas Schultz <aschultz@warp10.net>
for implementing an SPU decoder for implementing an SPU decoder
for fixing opening /dev/video in cDvbDevice::GrabImage() in case of NEWSTRUCT driver for fixing opening /dev/video in cDvbDevice::GrabImage() in case of NEWSTRUCT driver
for reporting a problem with plugin Makefiles and the NEWSTRUCT driver for reporting a problem with plugin Makefiles and the NEWSTRUCT driver
for pointing out some unnecessary #includes in eit.c, which caused warnings with gcc-3.2 for pointing out some unnecessary #includes in eit.c and a problem with
cMenuRecordings::Del(), which caused warnings with gcc-3.2
Aaron Holtzman Aaron Holtzman
for writing 'ac3dec' for writing 'ac3dec'

View File

@ -1571,5 +1571,6 @@ Video Disk Recorder Revision History
- The "Use DiSEqC" parameter in the "Setup/LNB" menu has been moved to the beginning - The "Use DiSEqC" parameter in the "Setup/LNB" menu has been moved to the beginning
of the list and disables the rest of the parameters when set to "yes", since these of the list and disables the rest of the parameters when set to "yes", since these
are now only meaningful if DiSEqC is _not_ used. are now only meaningful if DiSEqC is _not_ used.
- Removed some unnecessary #includes from eit.c, which caused warnings with gcc-3.2 - Removed some unnecessary #includes from eit.c and changed cMenuRecordings::Del()
(thanks to Andreas Schultz for pointing this out). to cMenuRecordings::Delete() to avoid warnings in gcc-3.2 (thanks to Andreas
Schultz for pointing this out).

6
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.210 2002/10/06 09:52:52 kls Exp $ * $Id: menu.c 1.211 2002/10/06 10:36:20 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -1605,7 +1605,7 @@ eOSState cMenuRecordings::Rewind(void)
return osContinue; return osContinue;
} }
eOSState cMenuRecordings::Del(void) eOSState cMenuRecordings::Delete(void)
{ {
cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current()); cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current());
if (ri && !ri->IsDirectory()) { if (ri && !ri->IsDirectory()) {
@ -1664,7 +1664,7 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key)
case kOk: case kOk:
case kRed: return Play(); case kRed: return Play();
case kGreen: return Rewind(); case kGreen: return Rewind();
case kYellow: return Del(); case kYellow: return Delete();
case kBlue: return Summary(); case kBlue: return Summary();
default: break; default: break;
} }

4
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.46 2002/09/29 08:16:31 kls Exp $ * $Id: menu.h 1.47 2002/10/06 10:35:49 kls Exp $
*/ */
#ifndef __MENU_H #ifndef __MENU_H
@ -68,7 +68,7 @@ private:
bool Open(bool OpenSubMenus = false); bool Open(bool OpenSubMenus = false);
eOSState Play(void); eOSState Play(void);
eOSState Rewind(void); eOSState Rewind(void);
eOSState Del(void); eOSState Delete(void);
eOSState Summary(void); eOSState Summary(void);
public: public:
cMenuRecordings(const char *Base = NULL, int Level = 0, bool OpenSubMenus = false); cMenuRecordings(const char *Base = NULL, int Level = 0, bool OpenSubMenus = false);