diff options
| -rw-r--r-- | CONTRIBUTORS | 3 | ||||
| -rw-r--r-- | HISTORY | 5 | ||||
| -rw-r--r-- | menu.c | 6 | ||||
| -rw-r--r-- | menu.h | 4 |
4 files changed, 10 insertions, 8 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 208fc60d..2bfe4714 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -176,7 +176,8 @@ Andreas Schultz <aschultz@warp10.net> for implementing an SPU decoder 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 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 for writing 'ac3dec' @@ -1571,5 +1571,6 @@ Video Disk Recorder Revision History - 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 are now only meaningful if DiSEqC is _not_ used. -- Removed some unnecessary #includes from eit.c, which caused warnings with gcc-3.2 - (thanks to Andreas Schultz for pointing this out). +- Removed some unnecessary #includes from eit.c and changed cMenuRecordings::Del() + to cMenuRecordings::Delete() to avoid warnings in gcc-3.2 (thanks to Andreas + Schultz for pointing this out). @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * 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" @@ -1605,7 +1605,7 @@ eOSState cMenuRecordings::Rewind(void) return osContinue; } -eOSState cMenuRecordings::Del(void) +eOSState cMenuRecordings::Delete(void) { cMenuRecordingItem *ri = (cMenuRecordingItem *)Get(Current()); if (ri && !ri->IsDirectory()) { @@ -1664,7 +1664,7 @@ eOSState cMenuRecordings::ProcessKey(eKeys Key) case kOk: case kRed: return Play(); case kGreen: return Rewind(); - case kYellow: return Del(); + case kYellow: return Delete(); case kBlue: return Summary(); default: break; } @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * 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 @@ -68,7 +68,7 @@ private: bool Open(bool OpenSubMenus = false); eOSState Play(void); eOSState Rewind(void); - eOSState Del(void); + eOSState Delete(void); eOSState Summary(void); public: cMenuRecordings(const char *Base = NULL, int Level = 0, bool OpenSubMenus = false); |