Skip to content

V
vlc-gpu
Commit 86974813 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

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

parent 9b8d88b9
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
modules/gui/qt4/menus.cpp
View file @ 86974813
...@@ -219,7 +219,6 @@ static int VideoAutoMenuBuilder( vout_thread_t *p_object, ...@@ -219,7 +219,6 @@ static int VideoAutoMenuBuilder( vout_thread_t *p_object,
{ {
PUSH_INPUTVAR( "video-es" ); PUSH_INPUTVAR( "video-es" );
PUSH_INPUTVAR( "spu-es" ); PUSH_INPUTVAR( "spu-es" );
#warning This is wrong:
PUSH_VAR( "fullscreen" ); PUSH_VAR( "fullscreen" );
PUSH_VAR( "video-on-top" ); PUSH_VAR( "video-on-top" );
PUSH_VAR( "video-wallpaper" ); PUSH_VAR( "video-wallpaper" );
...@@ -1464,8 +1463,11 @@ void QVLCMenu::DoAction( QObject *data ) ...@@ -1464,8 +1463,11 @@ void QVLCMenu::DoAction( QObject *data )
vlc_object_t *p_object = itemData->p_obj; vlc_object_t *p_object = itemData->p_obj;
if( p_object == NULL ) return; if( p_object == NULL ) return;
if( !strcmp( itemData->psz_var, "fullscreen" ) ) /* Preserve settings across vouts via the playlist object: */
var_Set( pl_Get( p_object ), "fullscreen", itemData->val ); 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 ); var_Set( p_object, itemData->psz_var, itemData->val );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment