summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2006-03-25 12:17:12 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2006-03-25 12:17:12 +0100
commit172e3d6cd5ab1816a2ea4cb6f7f51e68319f0bc4 (patch)
tree6989ad3bb19ee32cd2fb64e000b35486a77b1d84
parenta4ee22ed85208c95623a08a6472ed7aefb7d576b (diff)
downloadvdr-172e3d6cd5ab1816a2ea4cb6f7f51e68319f0bc4.tar.gz
vdr-172e3d6cd5ab1816a2ea4cb6f7f51e68319f0bc4.tar.bz2
Made cMenuRecordings::GetRecording() 'protected'
-rw-r--r--CONTRIBUTORS3
-rw-r--r--HISTORY1
-rw-r--r--menu.h5
3 files changed, 7 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e3bc3dab..46566040 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1790,3 +1790,6 @@ Jan Lenz <email@JanLenz.de>
Oleg Roitburd <oleg@roitburd.de>
for translating OSD texts to the Russian language
+
+Marius Heidenstecker <marius@heidenstecker.de>
+ for suggesting to make cMenuRecordings::GetRecording() 'protected'
diff --git a/HISTORY b/HISTORY
index d5280146..520a91f6 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4441,3 +4441,4 @@ Video Disk Recorder Revision History
- Fixed calling a plugin's main menu function while a message is being displayed
(reported by Helmut Auer).
- Updated the Russian OSD texts (thanks to Oleg Roitburd).
+- Made cMenuRecordings::GetRecording() 'protected' (suggested by Marius Heidenstecker).
diff --git a/menu.h b/menu.h
index 098f1b5c..de6014e2 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.84 2006/02/25 14:39:29 kls Exp $
+ * $Id: menu.h 1.85 2006/03/25 12:15:19 kls Exp $
*/
#ifndef __MENU_H
@@ -165,13 +165,14 @@ private:
int helpKeys;
void SetHelpKeys(void);
void Set(bool Refresh = false);
- cRecording *GetRecording(cMenuRecordingItem *Item);
bool Open(bool OpenSubMenus = false);
eOSState Play(void);
eOSState Rewind(void);
eOSState Delete(void);
eOSState Info(void);
eOSState Commands(eKeys Key = kNone);
+protected:
+ cRecording *GetRecording(cMenuRecordingItem *Item);
public:
cMenuRecordings(const char *Base = NULL, int Level = 0, bool OpenSubMenus = false);
~cMenuRecordings();