From 688fa4424ae76592448a7fc33476c6bef107a594 Mon Sep 17 00:00:00 2001
From: Christian Gmeiner <christian.gmeiner@gmail.com>
Date: Wed, 7 Jan 2009 07:23:55 +0100
Subject: remove overlay support There is no need to support a overlay, as it
 is used to show the output of the graphics card on the tv.

---
 dxr3interface.c | 79 +--------------------------------------------------------
 dxr3interface.h | 11 +-------
 2 files changed, 2 insertions(+), 88 deletions(-)

diff --git a/dxr3interface.c b/dxr3interface.c
index 0ac4d55..7faf34f 100644
--- a/dxr3interface.c
+++ b/dxr3interface.c
@@ -2,7 +2,7 @@
  * dxr3interface.c
  *
  * Copyright (C) 2002-2004 Kai Möller
- * Copyright (C) 2004 Christian Gmeiner
+ * Copyright (C) 2004-2009 Christian Gmeiner
  * Copyright (C) 2005-2008 Ville Skyttä
  *
  * This program is free software; you can redistribute it and/or
@@ -74,17 +74,6 @@ cDxr3Interface::~cDxr3Interface()
     ReleaseDevices();
 }
 
-// main
-// ==================================
-void cDxr3Interface::Start()
-{
-}
-
-// ==================================
-void cDxr3Interface::Stop()
-{
-}
-
 // audio
 // ==================================
 //! set audio output to analog
@@ -356,71 +345,6 @@ void cDxr3Interface::DisableAudio()
     Unlock();
 }
 
-// ==================================
-//! enable overlay mode of the dxr3
-void cDxr3Interface::EnableOverlay()
-{
-    // first check if it is enabled already
-    if (m_OverlayActive)
-    {
-	return;
-    }
-
-    /*
-#define EM8300_OVERLAY_SIGNAL_ONLY 1
-#define EM8300_OVERLAY_SIGNAL_WITH_VGA 2
-#define EM8300_OVERLAY_VGA_ONLY 3
-    */
-
-    int ioval = EM8300_OVERLAY_SIGNAL_WITH_VGA;
-    // set overlay signal mode
-    if (ioctl(m_fdControl, EM8300_IOCTL_OVERLAY_SIGNALMODE, &ioval) == -1)
-    {
-	//######
-	esyslog("dxr3: unable to set overlay signal mode: %m");
-	return;
-    }
-
-    // setup overlay screen
-    em8300_overlay_screen_t scr;
-    scr.xsize = 1024;
-    scr.ysize = 768;
-
-    if (ioctl(m_fdControl, EM8300_IOCTL_OVERLAY_SETSCREEN, &scr) == -1)
-    {
-	//######
-	esyslog("dxr3: unable to set up overlay screen: %m");
-	return;
-    }
-
-    // setup overlay window
-    em8300_overlay_window_t win;
-    win.xpos = 0;
-    win.ypos = 0;
-    win.width = 1024;
-    win.height = 768;
-
-    if (ioctl(m_fdControl, EM8300_IOCTL_OVERLAY_SETWINDOW, &win) == -1)
-    {
-	//######
-	esyslog("dxr3: unable to set up overlay window: %m");
-	return;
-    }
-
-    m_OverlayActive = true;
-}
-
-// ==================================
-//! disable overlay mode of the dxr3
-void cDxr3Interface::DisableOverlay()
-{
-    // is it already disabled
-    if (!m_OverlayActive)
-    {
-	return;
-    }
-}
-
 // set/get functions
 // ==================================
 //! get aspect ratio
@@ -784,7 +708,6 @@ void cDxr3Interface::ClaimDevices()
     // set default values
     m_AudioActive = false;
     m_VideoActive = false;
-    m_OverlayActive = false;
     m_ExternalReleased = false;
     m_volume = 255;
     m_audioChannel = AUDIO_STEREO;
diff --git a/dxr3interface.h b/dxr3interface.h
index dffd8c8..6222e9e 100644
--- a/dxr3interface.h
+++ b/dxr3interface.h
@@ -2,7 +2,7 @@
  * dxr3interface.h
  *
  * Copyright (C) 2002-2004 Kai Möller
- * Copyright (C) 2004 Christian Gmeiner
+ * Copyright (C) 2004-2009 Christian Gmeiner
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -48,10 +48,6 @@ public:
     cDxr3Interface();
     ~cDxr3Interface();
 
-    // main
-    void Start();
-    void Stop();
-
     // audio
     void SetAudioAnalog();
     void SetAudioDigitalPCM();
@@ -108,8 +104,6 @@ public:
 	m_AudioActive = true;
     }
     void DisableAudio();
-    void EnableOverlay();
-    void DisableOverlay();
 
     // set/get functions
     uint32_t GetAspectRatio() const;
@@ -162,8 +156,6 @@ public:
     void ClearButton();
     void SetPalette(unsigned int *pal = NULL);
 
-    // overlay functions
-
     // helper functions for dxr3 main osd screen
     void ResetHardware();
 
@@ -200,7 +192,6 @@ private:
     int m_audioChannel;		///> 0=stereo, 1=left, 2=right audio channel
     bool m_AudioActive;		///< is audio active?
     bool m_VideoActive;		///< is video active?
-    bool m_OverlayActive;	///< is overlay active?
 
     // bcs
     em8300_bcs_t m_bcs;		///< BrightnessContrastSaturation values
-- 
cgit v1.2.3