From 4b9c19bcfacd48aa0403cdec0af890b63e10629c Mon Sep 17 00:00:00 2001
From: Christian Gmeiner <christian.gmeiner@gmail.com>
Date: Wed, 14 Oct 2009 19:17:42 +0200
Subject: remove old stuff from cDxr3Osd class and clean up related source
 parts

---
 dxr3osd.c | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

(limited to 'dxr3osd.c')

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;
     }
 
-- 
cgit v1.2.3