[vlc-devel] commit: qt4 and skins2: fix resizing issue when zooming in/ out and is_display_filled is enabled (Erwan Tulou )

git version control git at videolan.org
Tue Dec 22 17:49:39 CET 2009


vlc | branch: master | Erwan Tulou <erwan10 at videolan.org> | Tue Dec 22 16:26:32 2009 +0100| [671bf6f82838e1a58b94bd9bc21cf5b0b0fc79fa] | committer: Erwan Tulou 

qt4 and skins2: fix resizing issue when zooming in/out and is_display_filled is enabled

returning VLC_EGENERIC is no problem, since the vout system is an observer of the change in size and will report the real situation.
returning VLC_SUCCESS is wrong in an asynchronous environmenent, as resizing is only performed later on (or not) depending on GUI configuration.

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

 modules/gui/qt4/main_interface.cpp      |    2 +-
 modules/gui/skins2/src/vout_manager.cpp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 86bffe7..1390d2e 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -890,7 +890,7 @@ int MainInterface::controlVideo( int i_query, va_list args )
         unsigned int i_height = va_arg( args, unsigned int );
         emit askVideoToResize( i_width, i_height );
         emit askUpdate();
-        return VLC_SUCCESS;
+        return VLC_EGENERIC;
     }
     case VOUT_WINDOW_SET_ON_TOP:
     {
diff --git a/modules/gui/skins2/src/vout_manager.cpp b/modules/gui/skins2/src/vout_manager.cpp
index f4b65ef..02ed43c 100644
--- a/modules/gui/skins2/src/vout_manager.cpp
+++ b/modules/gui/skins2/src/vout_manager.cpp
@@ -358,7 +358,7 @@ int VoutManager::controlWindow( struct vout_window_t *pWnd,
                    AsyncQueue::instance( pThis->getIntf() );
                 pQueue->push( CmdGenericPtr( pCmd ) );
             }
-            return VLC_SUCCESS;
+            return VLC_EGENERIC;
         }
 
         case VOUT_WINDOW_SET_FULLSCREEN:




More information about the vlc-devel mailing list