On 8/27/07, Stone [EMAIL PROTECTED] wrote:
It seems the new Level parameter in cOsd has caused xine and softdevice
to fail in compile with vdr-1.5.9. Does anyone know how to fix these?
This seems to build now with these changes. I didnt add backwards
compatibility for 1.5.9 though. Please let me know if this is the correct
way.
Best Regards.
diff -ru softdevice.cvs.orig/softdevice.c softdevice.cvs/softdevice.c
--- softdevice.cvs.orig/softdevice.c 2007-07-24 04:10:13.0 -0700
+++ softdevice.cvs/softdevice.c 2007-08-26 18:06:33.0 -0700
@@ -119,7 +119,7 @@
static cOsd *osd;
public:
cSoftOsdProvider(cVideoOut *VideoOut);
-virtual cOsd *CreateOsd(int Left, int Top);
+virtual cOsd *CreateOsd(int Left, int Top, uint Level);
static cOsd *GetOsd();
};
@@ -130,9 +130,9 @@
videoOut = VideoOut;
}
-cOsd * cSoftOsdProvider::CreateOsd(int Left, int Top)
+cOsd * cSoftOsdProvider::CreateOsd(int Left, int Top, uint Level)
{
-osd = new cSoftOsd(videoOut, Left, Top);
+osd = new cSoftOsd(videoOut, Left, Top, Level);
return osd;
}
diff -ru softdevice.cvs.orig/SoftOsd.c softdevice.cvs/SoftOsd.c
--- softdevice.cvs.orig/SoftOsd.c 2007-07-24 04:10:11.0 -0700
+++ softdevice.cvs/SoftOsd.c 2007-08-26 18:14:57.0 -0700
@@ -46,8 +46,8 @@
/* ---
*/
-cSoftOsd::cSoftOsd(cVideoOut *VideoOut, int X, int Y)
-: cOsd(X, Y),active(false),close(false) {
+cSoftOsd::cSoftOsd(cVideoOut *VideoOut, int X, int Y, uint level)
+: cOsd(X, Y, 0),active(false),close(false) {
OSDDEB(cSoftOsd constructor\n);
OutputConvert=cSoftOsd::ARGB_to_ARGB32;
bitmap_Format=PF_None; // forces a clear after first SetMode
diff -ru softdevice.cvs.orig/SoftOsd.h softdevice.cvs/SoftOsd.h
--- softdevice.cvs.orig/SoftOsd.h 2007-07-24 04:10:11.0 -0700
+++ softdevice.cvs/SoftOsd.h 2007-08-26 18:13:17.0 -0700
@@ -91,7 +91,7 @@
int ScreenOsdWidth;
int ScreenOsdHeight;
public:
-cSoftOsd(cVideoOut *VideoOut, int XOfs, int XOfs);
+cSoftOsd(cVideoOut *VideoOut, int XOfs, int XOfs, uint level);
virtual ~cSoftOsd();
virtual void Flush(void);
--- xine-0.7.10/xineDevice.c.orig 2006-11-21 12:44:48.0 -0800
+++ xine-0.7.10/xineDevice.c 2007-08-26 17:52:52.0 -0700
@@ -3426,7 +3426,7 @@
#if APIVERSNUM 10307
cOsdBase *cXineDevice::NewOsd(int x, int y)
#else
- cOsd *cXineDevice::NewOsd(int x, int y)
+ cOsd *cXineDevice::NewOsd(int x, int y, uint level)
#endif
{
//::fprintf(stderr, NewOsd ---: %s\n, ::ctime((const time_t )::time(0)));
--- xine-0.7.10/xineDevice.h.orig 2006-04-17 09:33:18.0 -0700
+++ xine-0.7.10/xineDevice.h 2007-08-26 17:51:03.0 -0700
@@ -120,7 +120,7 @@
#if APIVERSNUM 10307
virtual cOsdBase *NewOsd(int x, int y);
#else
-virtual cOsd *NewOsd(int x, int y);
+virtual cOsd *NewOsd(int x, int y, uint level);
#endif
cXineDevice(cPlugin *const plugin, cXineSettings settings, cXineRemote *remote);
--- xine-0.7.10/xineOsd.c.orig 2006-04-17 09:35:17.0 -0700
+++ xine-0.7.10/xineOsd.c 2007-08-26 17:47:20.0 -0700
@@ -144,7 +144,7 @@
#if APIVERSNUM 10307
: cOsdBase(x, y)
#else
-: cOsd(x, y)
+: cOsd(x, y, 0)
#endif
, m_xineDevice(xineDevice)
, m_xineLib(xineDevice.m_xineLib)
@@ -366,9 +366,9 @@
{
}
- cOsd *cXineOsdProvider::CreateOsd(int Left, int Top)
+ cOsd *cXineOsdProvider::CreateOsd(int Left, int Top, uint Level)
{
-return m_xineDevice.NewOsd(Left, Top);
+return m_xineDevice.NewOsd(Left, Top, Level);
}
#endif
--- xine-0.7.10/xineOsd.h.orig 2006-04-17 09:37:32.0 -0700
+++ xine-0.7.10/xineOsd.h 2007-08-26 17:42:17.0 -0700
@@ -81,7 +81,7 @@
public:
cXineOsdProvider(cXineDevice xineDevice);
-virtual cOsd *CreateOsd(int Left, int Top);
+virtual cOsd *CreateOsd(int Left, int Top, uint Level);
};
#endif
___
vdr mailing list
vdr@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr
