1 files changed, 4 insertions, 24 deletions
diff --git a/menu.h b/menu.h
index 82fd640..9e49bf6 100644
--- a/menu.h
+++ b/menu.h
@@ -4,16 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.35 2002/01/20 13:38:34 kls Exp $
+ * $Id: menu.h 1.37 2002/02/24 12:40:37 kls Exp $
  */
 
 #ifndef _MENU_H
 #define _MENU_H
 
 #include "dvbapi.h"
-#ifdef DVDSUPPORT
-#include "dvd.h"
-#endif //DVDSUPPORT
 #include "osd.h"
 #include "recording.h"
 
@@ -43,18 +40,6 @@ public:
   virtual eOSState ProcessKey(eKeys Key);
   };
 
-#ifdef DVDSUPPORT
-class cMenuDVD : public cOsdMenu {
-private:
-  cDVD *dvd;//XXX member really necessary???
-  eOSState Play(void);
-  eOSState Eject(void);
-public:
-  cMenuDVD(void);
-  virtual eOSState ProcessKey(eKeys Key);
-  };
-#endif //DVDSUPPORT
-
 class cMenuRecordingItem;
 
 class cMenuRecordings : public cOsdMenu {
@@ -92,6 +77,8 @@ public:
   void Stop(bool KeepInstant = false);
   bool IsInstant(void) { return instantId; }
   const char *InstantId(void) { return instantId; }
+  const char *FileName(void) { return fileName; }
+  cTimer *Timer(void) { return timer; }
   };
 
 class cRecordControls {
@@ -103,6 +90,7 @@ public:
   static void Stop(cDvbApi *DvbApi);
   static bool StopPrimary(bool DoIt = false);
   static const char *GetInstantId(const char *LastInstantId);
+  static cRecordControl *GetRecordControl(const char *FileName);
   static void Process(time_t t);
   static bool Active(void);
   };
@@ -122,10 +110,6 @@ private:
   void Show(int Seconds = 0);
   void Hide(void);
   static char *fileName;
-#ifdef DVDSUPPORT
-  static cDVD *dvd;//XXX member really necessary???
-  static int titleid;//XXX
-#endif //DVDSUPPORT
   static char *title;
   void DisplayAtBottom(const char *s = NULL);
   void ShowMode(void);
@@ -141,10 +125,6 @@ public:
   virtual eOSState ProcessKey(eKeys Key);
   bool Visible(void) { return visible; }
   static void SetRecording(const char *FileName, const char *Title);
-#ifdef DVDSUPPORT
-  static void SetDVD(cDVD *DVD, int Title);//XXX
-  static int LastTitleID(void);
-#endif //DVDSUPPORT
   static const char *LastReplayed(void);
   static void ClearLastReplayed(const char *FileName);
   };