1 files changed, 15 insertions, 14 deletions

diff --git a/dvbosd.h b/dvbosd.h
index cbc7901f..bac43f51 100644
--- a/dvbosd.h
+++ b/dvbosd.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.h 1.16 2002/11/01 10:05:47 kls Exp $
+ * $Id: dvbosd.h 1.17 2004/04/30 13:44:16 kls Exp $
  */
 
 #ifndef __DVBOSD_H
@@ -12,25 +12,26 @@
 
 #include <linux/dvb/osd.h>
 #include "dvbdevice.h"
-#include "osdbase.h"
+#include "osd.h"
 
-class cDvbOsd : public cOsdBase {
+class cDvbOsd : public cOsd {
 private:
-  static const cDvbDevice *dvbDevice;
   int osdDev;
-  bool SetWindow(cWindow *Window);
+  bool shown;
   void Cmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL);
-protected:
-  virtual bool OpenWindow(cWindow *Window);
-  virtual void CommitWindow(cWindow *Window);
-  virtual void ShowWindow(cWindow *Window);
-  virtual void HideWindow(cWindow *Window, bool Hide);
-  virtual void MoveWindow(cWindow *Window, int x, int y);
-  virtual void CloseWindow(cWindow *Window);
 public:
-  cDvbOsd(int x, int y);
+  cDvbOsd(int Left, int Top, int OsdDev);
   virtual ~cDvbOsd();
-  static void SetDvbDevice(const cDvbDevice *DvbDevice);
+  virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
+  virtual void Flush(void);
+  };
+
+class cDvbOsdProvider : public cOsdProvider {
+private:
+  int osdDev;
+public:
+  cDvbOsdProvider(int OsdDev);
+  virtual cOsd *CreateOsd(int Left, int Top);
   };
 
 #endif //__DVBOSD_H