[vlc-devel] commit: skins2: remove dead code (Erwan Tulou )

git version control git at videolan.org
Mon Jan 25 20:08:42 CET 2010


vlc | branch: master | Erwan Tulou <erwan10 at videolan.org> | Mon Jan 25 11:31:21 2010 +0100| [cc371f3013ec72a0d3d61bb4f636ffa84eb3d109] | committer: Erwan Tulou 

skins2: remove dead code

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

 modules/gui/skins2/commands/cmd_resize.cpp |   11 -----------
 modules/gui/skins2/commands/cmd_resize.hpp |   15 ---------------
 modules/gui/skins2/controls/ctrl_video.cpp |   16 ----------------
 modules/gui/skins2/controls/ctrl_video.hpp |    3 ---
 4 files changed, 0 insertions(+), 45 deletions(-)

diff --git a/modules/gui/skins2/commands/cmd_resize.cpp b/modules/gui/skins2/commands/cmd_resize.cpp
index 2d98543..5903b46 100644
--- a/modules/gui/skins2/commands/cmd_resize.cpp
+++ b/modules/gui/skins2/commands/cmd_resize.cpp
@@ -44,17 +44,6 @@ void CmdResize::execute()
 
 
 
-CmdResizeInnerVout::CmdResizeInnerVout( intf_thread_t *pIntf,
-                    CtrlVideo* pCtrlVideo )
-    : CmdGeneric( pIntf ), m_pCtrlVideo( pCtrlVideo ) { }
-
-
-void CmdResizeInnerVout::execute()
-{
-    m_pCtrlVideo->resizeInnerVout();
-}
-
-
 CmdResizeVout::CmdResizeVout( intf_thread_t *pIntf, vout_window_t* pWnd,
                               int width, int height )
     : CmdGeneric( pIntf ), m_pWnd( pWnd ), m_width( width ),
diff --git a/modules/gui/skins2/commands/cmd_resize.hpp b/modules/gui/skins2/commands/cmd_resize.hpp
index 23afb4f..cf89d43 100644
--- a/modules/gui/skins2/commands/cmd_resize.hpp
+++ b/modules/gui/skins2/commands/cmd_resize.hpp
@@ -51,21 +51,6 @@ private:
 };
 
 
-/// Command to resize the inner vout window
-class CmdResizeInnerVout: public CmdGeneric
-{
-public:
-    /// Resize the given layout
-    CmdResizeInnerVout( intf_thread_t *pIntf, CtrlVideo* pCtrlVideo );
-    virtual ~CmdResizeInnerVout() { }
-    virtual void execute();
-    virtual string getType() const { return "resize inner vout"; }
-
-private:
-    CtrlVideo* m_pCtrlVideo;
-};
-
-
 /// Command to resize the vout window
 class CmdResizeVout: public CmdGeneric
 {
diff --git a/modules/gui/skins2/controls/ctrl_video.cpp b/modules/gui/skins2/controls/ctrl_video.cpp
index 484feb8..a430fed 100644
--- a/modules/gui/skins2/controls/ctrl_video.cpp
+++ b/modules/gui/skins2/controls/ctrl_video.cpp
@@ -212,19 +212,3 @@ void CtrlVideo::detachVoutWindow( )
     m_pVoutWindow = NULL;
 }
 
-
-void CtrlVideo::resizeInnerVout( )
-{
-    if( m_pVoutWindow )
-    {
-        WindowManager &rWindowManager =
-             getIntf()->p_sys->p_theme->getWindowManager();
-        TopWindow* pWin = getWindow();
-
-        const Position *pPos = getPosition();
-
-        m_pVoutWindow->resize( pPos->getWidth(), pPos->getHeight() );
-        m_pVoutWindow->move( pPos->getLeft(), pPos->getTop() );
-    }
-}
-
diff --git a/modules/gui/skins2/controls/ctrl_video.hpp b/modules/gui/skins2/controls/ctrl_video.hpp
index 570bd1c..2f9a19b 100644
--- a/modules/gui/skins2/controls/ctrl_video.hpp
+++ b/modules/gui/skins2/controls/ctrl_video.hpp
@@ -66,9 +66,6 @@ public:
     // Detach a voutWindow from a Video Control
     void detachVoutWindow( );
 
-    // Update the inner part of the Video Control
-    void resizeInnerVout( );
-
     // Get TopWindow associated with the video control
     virtual TopWindow* getWindow() { return CtrlGeneric::getWindow(); }
 




More information about the vlc-devel mailing list