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

git version control git at videolan.org
Fri Sep 26 04:32:30 CEST 2008


vlc | branch: 0.9-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Thu Sep 25 19:34:50 2008 -0700| [a0383d980c531a1d35b52db9b2c1d99c427a4181] | committer: Jean-Baptiste Kempf 

Qt4: go around another Win32 Vout bug.

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

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

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index fd2430c..3c49374 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -1102,6 +1102,18 @@ 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 5bfcd1f..ee02464 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();
-    void stop();
+    virtual void stop();
     void prev();
     void next();
     void updateVolume( int );
@@ -273,6 +273,7 @@ private slots:
     void hideFSC();
 
     void slowHideFSC();
+    virtual void stop();
 
 
 private:




More information about the vlc-devel mailing list