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

git version control git at videolan.org
Thu Jan 14 15:22:25 CET 2010


vlc | branch: master | Erwan Tulou <erwan10 at videolan.org> | Wed Jan 13 11:42:01 2010 +0100| [e0674167fc97a82404526c9a08735517fe70732f] | committer: Erwan Tulou 

skins2 : remove dead code (VoutWindow)

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

 modules/gui/skins2/src/vout_window.cpp |   17 +----------------
 modules/gui/skins2/src/vout_window.hpp |   10 ----------
 2 files changed, 1 insertions(+), 26 deletions(-)

diff --git a/modules/gui/skins2/src/vout_window.cpp b/modules/gui/skins2/src/vout_window.cpp
index a80b865..034ba46 100644
--- a/modules/gui/skins2/src/vout_window.cpp
+++ b/modules/gui/skins2/src/vout_window.cpp
@@ -33,19 +33,13 @@
 #include <vlc_keys.h>
 
 
-
-int VoutWindow::count = 0;
-
 VoutWindow::VoutWindow( intf_thread_t *pIntf, vout_window_t* pWnd,
                         int width, int height, GenericWindow* pParent ) :
       GenericWindow( pIntf, 0, 0, false, false, pParent,
                      GenericWindow::VoutWindow ),
       m_pWnd( pWnd ), original_width( width ), original_height( height ),
-      m_pParentWindow( pParent ), m_pCtrlVideo( NULL ), m_bFullscreen( false )
+      m_pParentWindow( pParent ), m_pCtrlVideo( NULL )
 {
-    // counter for debug
-    count++;
-
     if( m_pWnd )
         vlc_object_hold( m_pWnd );
 }
@@ -55,9 +49,6 @@ VoutWindow::~VoutWindow()
 {
     if( m_pWnd )
         vlc_object_release( m_pWnd );
-
-    count--;
-    msg_Dbg( getIntf(), "VoutWindow count = %d", count );
 }
 
 
@@ -94,12 +85,6 @@ void VoutWindow::setCtrlVideo( CtrlVideo* pCtrlVideo )
 }
 
 
-void VoutWindow::setFullscreen( bool b_fullscreen )
-{
-    /*TODO: fullscreen implementation */
-}
-
-
 void VoutWindow::processEvent( EvtKey &rEvtKey )
 {
     // Only do the action when the key is down
diff --git a/modules/gui/skins2/src/vout_window.hpp b/modules/gui/skins2/src/vout_window.hpp
index 2ff60ba..f64d033 100644
--- a/modules/gui/skins2/src/vout_window.hpp
+++ b/modules/gui/skins2/src/vout_window.hpp
@@ -40,9 +40,6 @@ public:
                 int width, int height, GenericWindow* pParent = NULL );
     virtual ~VoutWindow();
 
-    // counter used for debugging purpose
-    static int count;
-
     /// Make some functions public
     //@{
     using GenericWindow::show;
@@ -62,10 +59,6 @@ public:
     virtual void setCtrlVideo( CtrlVideo* pCtrlVideo );
     virtual CtrlVideo* getCtrlVideo( ) { return m_pCtrlVideo; }
 
-    /// toggle fullscreen mode
-    virtual void setFullscreen( bool b_fullscreen );
-    virtual bool isFullscreen() { return m_bFullscreen; }
-
     /// get original size of vout
     virtual int getOriginalWidth( ) { return original_width; }
     virtual int getOriginalHeight( ) { return original_height; }
@@ -85,9 +78,6 @@ private:
     int original_width;
     int original_height;
 
-    /// fulscreen mode indicator
-    bool m_bFullscreen;
-
     /// VideoControl attached to it
     CtrlVideo* m_pCtrlVideo;
 




More information about the vlc-devel mailing list