summaryrefslogtreecommitdiff
path: root/osd.h
diff options
context:
space:
mode:
Diffstat (limited to 'osd.h')
-rw-r--r--osd.h44
1 files changed, 4 insertions, 40 deletions
diff --git a/osd.h b/osd.h
index 97f1d974..74baf804 100644
--- a/osd.h
+++ b/osd.h
@@ -4,52 +4,17 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: osd.h,v 1.4 2007-09-01 08:47:04 phintuka Exp $
+ * $Id: osd.h,v 1.5 2007-10-15 00:31:39 phintuka Exp $
*
*/
#ifndef __XINELIB_OSD_H
#define __XINELIB_OSD_H
-#include <vdr/config.h>
#include <vdr/osd.h>
-#include <vdr/tools.h> // cListObject
class cXinelibDevice;
-class cXinelibOsd : public cOsd, public cListObject
-{
- private:
- cXinelibOsd();
- cXinelibOsd(cXinelibOsd&);
-
- cXinelibDevice *m_Device;
-
- protected:
- static cMutex m_Lock;
- static cList<cXinelibOsd> m_OsdStack;
-
- bool m_IsVisible;
- bool m_Shown;
-
- virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
- virtual eOsdError SetAreas(const tArea *Areas, int NumAreas);
- virtual void Flush(void);
-
- // Messages from cXinelibOsdProvider
- void Show(void);
- void Hide(void);
- void Refresh(void);
- void Detach(void);
-
- friend class cXinelibOsdProvider;
-
- public:
- cXinelibOsd(cXinelibDevice *Device, int x, int y, uint Level = 0);
- virtual ~cXinelibOsd();
-};
-
-
class cXinelibOsdProvider : public cOsdProvider
{
protected:
@@ -59,13 +24,12 @@ class cXinelibOsdProvider : public cOsdProvider
cXinelibOsdProvider(cXinelibDevice *Device);
virtual ~cXinelibOsdProvider();
-#if VDRVERSNUM >= 10509
virtual cOsd *CreateOsd(int Left, int Top, uint Level);
-#else
- virtual cOsd *CreateOsd(int Left, int Top);
-#endif
static void RefreshOsd(void);
+
+ // VDR < 1.5.9 compability
+ virtual cOsd *CreateOsd(int Left, int Top) { return CreateOsd(Left, Top, 0); }
};
#endif //__XINELIB_OSD_H