[vlc-commits] commit: Qt4: preserve video-on-op, fix #3469 ( Rémi Denis-Courmont )

[git at videolan.org]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Mar 29 00:41:25 2010 +0300| [8697481322874db6a06b1b1864ed32cab0276fcd] | committer: Rémi Denis-Courmont 

Qt4: preserve video-on-op, fix #3469

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

 modules/gui/qt4/menus.cpp |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index a933ffb..f48ca57 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -219,7 +219,6 @@ static int VideoAutoMenuBuilder( vout_thread_t *p_object,
 {
     PUSH_INPUTVAR( "video-es" );
     PUSH_INPUTVAR( "spu-es" );
-#warning This is wrong:
     PUSH_VAR( "fullscreen" );
     PUSH_VAR( "video-on-top" );
     PUSH_VAR( "video-wallpaper" );
@@ -1464,8 +1463,11 @@ void QVLCMenu::DoAction( QObject *data )
     vlc_object_t *p_object = itemData->p_obj;
     if( p_object == NULL ) return;
 
-    if( !strcmp( itemData->psz_var, "fullscreen" ) )
-        var_Set( pl_Get( p_object ), "fullscreen", itemData->val );
+    /* Preserve settings across vouts via the playlist object: */
+    if( !strcmp( itemData->psz_var, "fullscreen" )
+     || !strcmp( itemData->psz_var, "video-on-top" ) )
+        var_Set( pl_Get( p_object ), itemData->psz_var, itemData->val );
+
     var_Set( p_object, itemData->psz_var, itemData->val );
 }