[vlc-devel] commit: Qt4: do not implement below state ( Rémi Denis-Courmont )

git version control git at videolan.org
Sat Dec 26 19:01:25 CET 2009


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Dec 26 19:46:21 2009 +0200| [ec945c264c2b53b0e20a1b9a7198efa31e0f29ab] | committer: Rémi Denis-Courmont 

Qt4: do not implement below state

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

 modules/gui/qt4/main_interface.cpp |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 493181b..8663c38 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -69,7 +69,7 @@
 
 #include <vlc_keys.h> /* Wheel event */
 #include <vlc_vout_window.h>
-#include <vlc_vout.h>
+#include <vlc_vout_display.h>
 
 // #define DEBUG_INTF
 /* Callback prototypes */
@@ -894,8 +894,9 @@ int MainInterface::controlVideo( int i_query, va_list args )
     }
     case VOUT_WINDOW_SET_STATE:
     {
-        int i_arg = va_arg( args, int );
-        QApplication::postEvent( this, new SetVideoOnTopQtEvent( i_arg ) );
+        unsigned i_arg = va_arg( args, unsigned );
+        unsigned on_top = i_arg & VOUT_WINDOW_STATE_ABOVE;
+        QApplication::postEvent( this, new SetVideoOnTopQtEvent( on_top ) );
         return VLC_SUCCESS;
     }
     case VOUT_WINDOW_SET_FULLSCREEN:




More information about the vlc-devel mailing list