[vlc-commits] skins2: remove dead code

[Erwan Tulou]

vlc | branch: master | Erwan Tulou <erwan10 at videolan.org> | Wed Jan 19 14:32:44 2011 +0100| [7647873a9afbaede019a95da0d0732ae757073a6] | committer: Erwan Tulou

skins2: remove dead code

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7647873a9afbaede019a95da0d0732ae757073a6
---

 modules/gui/skins2/src/os_factory.hpp      |    3 ---
 modules/gui/skins2/src/vout_window.cpp     |    8 +-------
 modules/gui/skins2/win32/win32_factory.hpp |    2 --
 modules/gui/skins2/x11/x11_display.hpp     |    3 ---
 modules/gui/skins2/x11/x11_factory.hpp     |    3 ---
 5 files changed, 1 insertions(+), 18 deletions(-)

diff --git a/modules/gui/skins2/src/os_factory.hpp b/modules/gui/skins2/src/os_factory.hpp
index 7a753a3..c4f3a8c 100644
--- a/modules/gui/skins2/src/os_factory.hpp
+++ b/modules/gui/skins2/src/os_factory.hpp
@@ -132,9 +132,6 @@ public:
     /// Delete a directory recursively
     virtual void rmDir( const string &rPath ) = 0;
 
-    /// Get Display
-    virtual char* getDisplay() = 0;
-
 protected:
     // Protected because it's a singleton
     OSFactory( intf_thread_t* pIntf ): SkinObject( pIntf ) { }
diff --git a/modules/gui/skins2/src/vout_window.cpp b/modules/gui/skins2/src/vout_window.cpp
index ba43579..7ee460d 100644
--- a/modules/gui/skins2/src/vout_window.cpp
+++ b/modules/gui/skins2/src/vout_window.cpp
@@ -46,9 +46,7 @@ VoutWindow::VoutWindow( intf_thread_t *pIntf, vout_window_t* pWnd,
 
 #ifdef X11_SKINS
         m_pWnd->handle.xid = getOSHandle();
-        if( m_pWnd->handle.xid )
-            m_pWnd->display.x11 =
-                OSFactory::instance( getIntf() )->getDisplay();
+        m_pWnd->display.x11 = NULL;
 #else
         m_pWnd->handle.hwnd = getOSHandle();
 #endif
@@ -61,10 +59,6 @@ VoutWindow::~VoutWindow()
 {
     if( m_pWnd )
     {
-#ifdef X11_SKINS
-        free( m_pWnd->display.x11 );
-        m_pWnd->display.x11 = NULL;
-#endif
         vlc_object_release( m_pWnd );
     }
 }
diff --git a/modules/gui/skins2/win32/win32_factory.hpp b/modules/gui/skins2/win32/win32_factory.hpp
index bbab251..af9061d 100644
--- a/modules/gui/skins2/win32/win32_factory.hpp
+++ b/modules/gui/skins2/win32/win32_factory.hpp
@@ -118,8 +118,6 @@ public:
 
     HWND getParentWindow() { return m_hParentWindow; }
 
-    char* getDisplay() { return NULL; }
-
     /// Callback function (Windows Procedure)
     static LRESULT CALLBACK Win32Proc( HWND hwnd, UINT uMsg,
                                        WPARAM wParam, LPARAM lParam );
diff --git a/modules/gui/skins2/x11/x11_display.hpp b/modules/gui/skins2/x11/x11_display.hpp
index 837899b..9647263 100644
--- a/modules/gui/skins2/x11/x11_display.hpp
+++ b/modules/gui/skins2/x11/x11_display.hpp
@@ -83,9 +83,6 @@ public:
     /// Get the main window ID
     Window getMainWindow() const { return m_mainWindow; }
 
-    /// Get the x11_display string (to be freed by caller)
-    char* getX11Display() { return NULL; }
-
     /// EWMH spec
     Atom m_net_wm_supported;
     Atom m_net_wm_state;
diff --git a/modules/gui/skins2/x11/x11_factory.hpp b/modules/gui/skins2/x11/x11_factory.hpp
index bdfd2a5..b53ae23 100644
--- a/modules/gui/skins2/x11/x11_factory.hpp
+++ b/modules/gui/skins2/x11/x11_factory.hpp
@@ -142,9 +142,6 @@ public:
     /// Get the timer loop
     X11TimerLoop *getTimerLoop() const { return m_pTimerLoop; }
 
-    /// Get x11_display string (to be freed by caller)
-    char* getDisplay() { return m_pDisplay->getX11Display(); }
-
 private:
     /// X11 display
     X11Display *m_pDisplay;