summaryrefslogtreecommitdiff
path: root/dvbosd.h
diff options
context:
space:
mode:
authorKlaus Schmidinger <kls (at) cadsoft (dot) de>2002-08-04 18:00:00 +0200
committerKlaus Schmidinger <kls (at) cadsoft (dot) de>2002-08-04 18:00:00 +0200
commit527748826c8d3cfacff8a7ab3fda9551c1182590 (patch)
tree4e753aa85bc11b44e078809b643b7e5d6be5fdd9 /dvbosd.h
parenta4112a96a67dbeb1cd6a63d2b4fa4b837462f467 (diff)
downloadvdr-patch-lnbsharing-527748826c8d3cfacff8a7ab3fda9551c1182590.tar.gz
vdr-patch-lnbsharing-527748826c8d3cfacff8a7ab3fda9551c1182590.tar.bz2
Version 1.1.6vdr-1.1.6
- Re-visited the race condition fix in the cDvbPlayer (thanks again to Andreas Schultz). - Changed the VFAT handling to allow users who normally use it but have forgotten to set it when compiling a new version of VDR to at least see their recordings made with VFAT enabled (thanks to Christian Rienecker). - Added some missing teletext PIDs (thanks to Joerg Riechardt). - Fixed PID handling for cReceiver. - Added a missing #include to ringbuffer.c (thanks to Martin Hammerschmid). - Now using CC, CFLAGS, CXX and CXXFLAGS in Makefile. - Changed the cDevice class to allow plugins to implement their own devices (see PLUGINS.html for details).
Diffstat (limited to 'dvbosd.h')
-rw-r--r--dvbosd.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/dvbosd.h b/dvbosd.h
index 0bc6079..69838f6 100644
--- a/dvbosd.h
+++ b/dvbosd.h
@@ -4,17 +4,19 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbosd.h 1.13 2002/05/18 13:38:09 kls Exp $
+ * $Id: dvbosd.h 1.14 2002/08/04 10:12:14 kls Exp $
*/
#ifndef __DVBOSD_H
#define __DVBOSD_H
#include <ost/osd.h>
+#include "dvbdevice.h"
#include "osdbase.h"
class cDvbOsd : public cOsdBase {
private:
+ static const cDvbDevice *dvbDevice;
int osdDev;
bool SetWindow(cWindow *Window);
void Cmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL);
@@ -26,8 +28,9 @@ protected:
virtual void MoveWindow(cWindow *Window, int x, int y);
virtual void CloseWindow(cWindow *Window);
public:
- cDvbOsd(int OsdDev, int x, int y);
+ cDvbOsd(int x, int y);
virtual ~cDvbOsd();
+ static void SetDvbDevice(const cDvbDevice *DvbDevice);
};
#endif //__DVBOSD_H