diff options
-rw-r--r-- | HISTORY | 5 | ||||
-rw-r--r-- | dxr3osd.c | 9 | ||||
-rw-r--r-- | dxr3osd.h | 4 | ||||
-rw-r--r-- | dxr3osd_subpicture.c | 5 | ||||
-rw-r--r-- | dxr3osd_subpicture.h | 6 |
5 files changed, 25 insertions, 4 deletions
@@ -334,5 +334,6 @@ NOTE: I havent found time to include all of the languages, will be done in pre2 200x-xx-xx: Version x.x.x -- Fix build with >= ~2007-07 ffmpeg (Ville Skyttä) -- Drop support for < 1.4.0 VDR versions (Ville Skyttä) +- Fix build with ffmpeg >= ~2007-07 (Ville Skyttä) +- Fix build with VDR >= 1.5.9 (Ville Skyttä) +- Drop support for VDR < 1.4.0 (Ville Skyttä) @@ -34,11 +34,18 @@ #include "dxr3osd_subpicture.h" // ================================== -// ! create osd at (Left, Top) +// ! create osd at (Left, Top, Level) +#if APIVERSNUM < 10509 cOsd *cDxr3OsdProvider::CreateOsd(int Left, int Top) { return new cDxr3SubpictureOsd(Left, Top); } +#else +cOsd *cDxr3OsdProvider::CreateOsd(int Left, int Top, uint Level) +{ + return new cDxr3SubpictureOsd(Left, Top, Level); +} +#endif // Local variables: // mode: c++ @@ -10,7 +10,11 @@ class cDxr3OsdProvider : public cOsdProvider { public: cDxr3OsdProvider() {} +#if APIVERSNUM < 10509 virtual cOsd *CreateOsd(int Left, int Top); +#else + virtual cOsd *CreateOsd(int Left, int Top, uint Level); +#endif }; #endif /*_DXR3_OSD_H_*/ diff --git a/dxr3osd_subpicture.c b/dxr3osd_subpicture.c index 77eed30..a7c6c0f 100644 --- a/dxr3osd_subpicture.c +++ b/dxr3osd_subpicture.c @@ -33,7 +33,12 @@ public: // ================================== //! constructor +#if APIVERSNUM < 10509 cDxr3SubpictureOsd::cDxr3SubpictureOsd(int Left, int Top) : cOsd(Left, Top) +#else +cDxr3SubpictureOsd::cDxr3SubpictureOsd(int Left, int Top, uint Level) + : cOsd(Left, Top, 0) +#endif { shown = false; Palette = new cPalette(4); diff --git a/dxr3osd_subpicture.h b/dxr3osd_subpicture.h index 7ff36bb..b2276b0 100644 --- a/dxr3osd_subpicture.h +++ b/dxr3osd_subpicture.h @@ -15,7 +15,11 @@ private: cTimeMs *last; public: - cDxr3SubpictureOsd(int Left, int Top/*, int SpuDev*/); +#if APIVERSNUM < 10509 + cDxr3SubpictureOsd(int Left, int Top); +#else + cDxr3SubpictureOsd(int Left, int Top, uint Level); +#endif ~cDxr3SubpictureOsd(); eOsdError CanHandleAreas(const tArea *Areas, int NumAreas); |