2 files changed, 8 insertions, 21 deletions
diff --git a/dxr3osd.c b/dxr3osd.c
index 2805a4d..1359274 100644
--- a/dxr3osd.c
+++ b/dxr3osd.c
@@ -71,8 +71,6 @@ cDxr3Osd::cDxr3Osd(int Left, int Top, uint Level)
     mergedBitmap = NULL;
     shown = false;
     Palette = new cPalette(4);
-    last = new cTimeMs();
-    Spu = cSPUEncoder::instance();
 }
 
 // ==================================
@@ -80,7 +78,6 @@ cDxr3Osd::~cDxr3Osd()
 {
     SetActive(false);
     delete Palette;
-    delete last;
 
     if (mergedBitmap)
         delete mergedBitmap;
@@ -89,20 +86,12 @@ cDxr3Osd::~cDxr3Osd()
 // ==================================
 void cDxr3Osd::SetActive(bool On)
 {
-  if (On != Active())
-  {
-      // Clears the OSD screen image when it becomes active
-      // removes it from screen when it becomes inactive
-      cOsd::SetActive(On);
-      if (On)
-      {
-	  Spu->Clear();
-      }
-      else
-      {
-          cSpuEncoder::instance()->clearOsd();
-      }
-  }
+    if (On != Active()) {
+        cOsd::SetActive(On);
+        if (!On) {
+            cSpuEncoder::instance()->clearOsd();
+        }
+    }
 }
 
 // ==================================
@@ -138,7 +127,6 @@ eOsdError cDxr3Osd::CanHandleAreas(const tArea *Areas, int NumAreas)
 eOsdError cDxr3Osd::SetAreas(const tArea *Areas, int NumAreas)
 {
     if (shown) {
-	Spu->Clear();
 	shown = false;
     }
 
diff --git a/dxr3osd.h b/dxr3osd.h
index 02ea97b..6adb9f8 100644
--- a/dxr3osd.h
+++ b/dxr3osd.h
@@ -1,7 +1,8 @@
 #ifndef _DXR3_OSD_H_
 #define _DXR3_OSD_H_
 
-#include "dxr3interface_spu_encoder.h"
+#include <utility>
+#include <vdr/osd.h>
 
 // ==================================
 // osd plugin provider
@@ -30,10 +31,8 @@ protected:
     virtual void SetActive(bool On);
 
 private:
-    cSPUEncoder* Spu;		///< interface to cSPUEncoder
     bool shown;			///< is the osd shown?
     cPalette* Palette;		///< global palette (needed by all bitmaps)
-    cTimeMs *last;
     tArea areas[MAXNUMWINDOWS];
     int numAreas;
     cBitmap *mergedBitmap;