diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2007-10-01 16:25:38 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2007-10-01 16:25:38 +0000 |
| commit | 1eb6f0445486539004a074c874d4ab45472863ad (patch) | |
| tree | d0c9e96391eaf5259dc9efc08a9ece81bc34e262 /media-plugins/vdr-softdevice/files | |
| parent | Stable on ppc64; bug #194178 (diff) | |
| download | historical-1eb6f0445486539004a074c874d4ab45472863ad.tar.gz historical-1eb6f0445486539004a074c874d4ab45472863ad.tar.bz2 historical-1eb6f0445486539004a074c874d4ab45472863ad.zip | |
Make it compile against vdr-1.5.9.
Package-Manager: portage-2.1.3.11
Diffstat (limited to 'media-plugins/vdr-softdevice/files')
| -rw-r--r-- | media-plugins/vdr-softdevice/files/vdr-softdevice-20070711-vdr-1.5.9.diff | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/media-plugins/vdr-softdevice/files/vdr-softdevice-20070711-vdr-1.5.9.diff b/media-plugins/vdr-softdevice/files/vdr-softdevice-20070711-vdr-1.5.9.diff new file mode 100644 index 000000000000..73f22ebedbe3 --- /dev/null +++ b/media-plugins/vdr-softdevice/files/vdr-softdevice-20070711-vdr-1.5.9.diff @@ -0,0 +1,50 @@ +diff -ru softdevice.cvs.orig/softdevice.c softdevice.cvs/softdevice.c +--- softdevice.cvs.orig/softdevice.c 2007-07-24 04:10:13.000000000 -0700 ++++ softdevice.cvs/softdevice.c 2007-08-26 18:06:33.000000000 -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.000000000 -0700 ++++ softdevice.cvs/SoftOsd.c 2007-08-26 18:14:57.000000000 -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.000000000 -0700 ++++ softdevice.cvs/SoftOsd.h 2007-08-26 18:13:17.000000000 -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); + |