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).

1 files changed, 10 insertions, 3 deletions

diff --git a/dvbosd.c b/dvbosd.c
index ad51966..ca5cf49 100644
--- a/dvbosd.c
+++ b/dvbosd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.c 1.17 2002/05/18 13:39:02 kls Exp $
+ * $Id: dvbosd.c 1.18 2002/08/04 10:13:21 kls Exp $
  */
 
 #include "dvbosd.h"
@@ -13,10 +13,12 @@
 #include <sys/unistd.h>
 #include "tools.h"
 
-cDvbOsd::cDvbOsd(int OsdDev, int x, int y)
+const cDvbDevice *cDvbOsd::dvbDevice = NULL;
+
+cDvbOsd::cDvbOsd(int x, int y)
 :cOsdBase(x, y)
 {
-  osdDev = OsdDev;
+  osdDev = dvbDevice ? dvbDevice->OsdDeviceHandle() : -1;
   if (osdDev < 0)
      esyslog("ERROR: illegal OSD device handle (%d)!", osdDev);
 }
@@ -27,6 +29,11 @@ cDvbOsd::~cDvbOsd()
       CloseWindow(GetWindowNr(i));
 }
 
+void cDvbOsd::SetDvbDevice(const cDvbDevice *DvbDevice)
+{
+  dvbDevice = DvbDevice;
+}
+
 bool cDvbOsd::SetWindow(cWindow *Window)
 {
   if (Window) {