diff options
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | dxr3.c | 6 | ||||
| -rw-r--r-- | dxr3osd.c | 7 | ||||
| -rw-r--r-- | dxr3osd.h | 4 | ||||
| -rw-r--r-- | dxr3osd_subpicture.c | 18 | ||||
| -rw-r--r-- | dxr3osd_subpicture.h | 6 |
7 files changed, 5 insertions, 39 deletions
@@ -348,3 +348,4 @@ NOTE: I havent found time to include all of the languages, will be done in pre2 - Add SVDRP commands for device release/reopen, audio output settings, brightness/contrast/saturation (Krzysztof Parma, Ville Skyttä) - Switch to VDR 1.6's i18n system (Ville Skyttä) +- Drop support for VDR < 1.6.0 (Ville Skyttä) @@ -4,7 +4,7 @@ Prerequisites: install, configure, test and verify the installation. If you use version 0.16.0 or later of the driver, be sure to load it in OSS audio mode (audio_driver=oss parameter to the em8300 module). -- Install VDR 1.4.x +- Install VDR 1.6.x - Install the libavcodec library from http://ffmpeg.sourceforge.net/ Installation: @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: dxr3.c,v 1.1.2.40 2008/12/29 21:14:18 scop Exp $ + * $Id: dxr3.c,v 1.1.2.41 2008/12/29 21:50:23 scop Exp $ * */ @@ -17,8 +17,8 @@ static const char VERSION[] = "0.2.8+cvs"; static const char DESCRIPTION[] = trNOOP("Hardware MPEG decoder"); -#if APIVERSNUM && APIVERSNUM < 10400 -#error "This version of the DXR3 plugin needs VDR API version >= 1.4.0" +#if APIVERSNUM && APIVERSNUM < 10600 +#error "This version of the DXR3 plugin needs VDR API version >= 1.6.0" #endif #define DXR3_MAX_CARDS 4 @@ -35,17 +35,10 @@ // ================================== // ! 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,11 +10,7 @@ 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 f7be998..9cfdb39 100644 --- a/dxr3osd_subpicture.c +++ b/dxr3osd_subpicture.c @@ -33,39 +33,24 @@ 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, Level) -#endif { shown = false; Palette = new cPalette(4); last = new cTimeMs(); last->Set(-cDxr3ConfigData::Instance().GetOsdFlushRate()); Spu = &cSPUEncoder::Instance(); - -#if APIVERSNUM < 10509 - //Clears the OSD screen image - Spu->Clear(); -#endif } // ================================== cDxr3SubpictureOsd::~cDxr3SubpictureOsd() { -#if APIVERSNUM < 10509 - //Remove the OSD from the screen - Spu->StopSpu(); -#else SetActive(false); -#endif delete Palette; delete last; } -#if APIVERSNUM >= 10509 // ================================== void cDxr3SubpictureOsd::SetActive(bool On) { @@ -84,7 +69,6 @@ void cDxr3SubpictureOsd::SetActive(bool On) } } } -#endif // ================================== eOsdError cDxr3SubpictureOsd::CanHandleAreas(const tArea *Areas, int NumAreas) @@ -130,10 +114,8 @@ eOsdError cDxr3SubpictureOsd::SetAreas(const tArea *Areas, int NumAreas) // ================================== void cDxr3SubpictureOsd::Flush() { -#if APIVERSNUM >= 10509 if (!Active()) return; -#endif if (last->Elapsed() < cDxr3ConfigData::Instance().GetOsdFlushRate()) return; last->Set(); diff --git a/dxr3osd_subpicture.h b/dxr3osd_subpicture.h index eb7d732..6f847c6 100644 --- a/dxr3osd_subpicture.h +++ b/dxr3osd_subpicture.h @@ -13,16 +13,10 @@ private: bool shown; ///< is the osd shown? cPalette* Palette; ///< global palette (needed by all bitmaps) cTimeMs *last; -#if APIVERSNUM >= 10509 protected: virtual void SetActive(bool On); -#endif public: -#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); |