[vlc-devel] commit: Revert "Qt4: go around another Win32 Vout bug." ( Jean-Baptiste Kempf )

git version control git at videolan.org
Wed Oct 1 10:06:37 CEST 2008


vlc | branch: 0.9-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Tue Sep 30 22:25:45 2008 -0700| [7f7e8bb80191e5f8ae1a6eb07310f77aeea752a3] | committer: Jean-Baptiste Kempf 

Revert "Qt4: go around another Win32 Vout bug."

This reverts commit a0383d980c531a1d35b52db9b2c1d99c427a4181.

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

 modules/gui/qt4/components/interface_widgets.cpp |   12 ------------
 modules/gui/qt4/components/interface_widgets.hpp |    3 +--
 2 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 3c49374..fd2430c 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -1102,18 +1102,6 @@ FullscreenControllerWidget::~FullscreenControllerWidget()
     vlc_mutex_destroy( &lock );
 }
 
-
-void FullscreenControllerWidget::stop()
-{
-#ifdef WIN32
-    if( p_vout )
-        var_SetBool( p_vout, "fullscreen", false );
-#endif
-
-    THEMIM->stop();
-}
-
-
 /**
  * Show fullscreen controller
  */
diff --git a/modules/gui/qt4/components/interface_widgets.hpp b/modules/gui/qt4/components/interface_widgets.hpp
index ee02464..5bfcd1f 100644
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -201,7 +201,7 @@ protected:
     bool                 b_telexEnabled;
 protected slots:
     void play();
-    virtual void stop();
+    void stop();
     void prev();
     void next();
     void updateVolume( int );
@@ -273,7 +273,6 @@ private slots:
     void hideFSC();
 
     void slowHideFSC();
-    virtual void stop();
 
 
 private:




More information about the vlc-devel mailing list