Totally rearranged device/player/recorder structures

1 files changed, 12 insertions, 9 deletions

diff --git a/menu.h b/menu.h
index 70aba6e6..9dfe1a40 100644
--- a/menu.h
+++ b/menu.h
@@ -4,14 +4,16 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.43 2002/05/18 12:36:06 kls Exp $
+ * $Id: menu.h 1.44 2002/06/14 12:33:35 kls Exp $
  */
 
 #ifndef __MENU_H
 #define __MENU_H
 
-#include "dvbapi.h"
+#include "device.h"
 #include "osd.h"
+#include "dvbplayer.h"
+#include "recorder.h"
 #include "recording.h"
 
 class cMenuMain : public cOsdMenu {
@@ -76,17 +78,18 @@ public:
 
 class cRecordControl {
 private:
-  cDvbApi *dvbApi;
+  cDevice *device;
   cTimer *timer;
+  cRecorder *recorder;
   const cEventInfo *eventInfo;
   char *instantId;
   char *fileName;
   bool GetEventInfo(void);
 public:
-  cRecordControl(cDvbApi *DvbApi, cTimer *Timer = NULL);
+  cRecordControl(cDevice *Device, cTimer *Timer = NULL);
   virtual ~cRecordControl();
   bool Process(time_t t);
-  bool Uses(cDvbApi *DvbApi) { return DvbApi == dvbApi; }
+  bool Uses(cDevice *Device) { return Device == device; }
   void Stop(bool KeepInstant = false);
   bool IsInstant(void) { return instantId; }
   const char *InstantId(void) { return instantId; }
@@ -96,21 +99,21 @@ public:
 
 class cRecordControls {
 private:
-  static cRecordControl *RecordControls[MAXDVBAPI];
+  static cRecordControl *RecordControls[];
 public:
   static bool Start(cTimer *Timer = NULL);
   static void Stop(const char *InstantId);
-  static void Stop(cDvbApi *DvbApi);
+  static void Stop(cDevice *Device);
   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);
+  static void Shutdown(void);
   };
 
-class cReplayControl : public cOsdObject {
+class cReplayControl : public cDvbPlayerControl {
 private:
-  cDvbApi *dvbApi;
   cMarks marks;
   bool visible, modeOnly, shown, displayFrames;
   int lastCurrent, lastTotal;