diff mbox

vdr-1.5.9 plugin patches

Message ID 2d842fa80708261833n30ca6df9maf2e0c514754444c@mail.gmail.com
State New
Headers

Commit Message

C.Y.M Aug. 27, 2007, 1:33 a.m. UTC 
  On 8/27/07, Stone <syphyr@gmail.com> 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.

Comments

Stefan Lucke Aug. 28, 2007, 10:28 p.m. UTC | #1 
On Montag 27 August 2007, Stone wrote:
> On 8/27/07, Stone <syphyr@gmail.com> 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.
> 

Thanks, guarded by "#if VDRVERSNUM .." it's in softdevice cvs now.
diff mbox

Patch

--- xine-0.7.10/xineDevice.c.orig	2006-11-21 12:44:48.000000000 -0800
+++ xine-0.7.10/xineDevice.c	2007-08-26 17:52:52.000000000 -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.000000000 -0700
+++ xine-0.7.10/xineDevice.h	2007-08-26 17:51:03.000000000 -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.000000000 -0700
+++ xine-0.7.10/xineOsd.c	2007-08-26 17:47:20.000000000 -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.000000000 -0700
+++ xine-0.7.10/xineOsd.h	2007-08-26 17:42:17.000000000 -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