Skip to content

V
vlc
Commit 12e13887 authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

Revert "Disable video-on-top while in fullscreen" 

This reverts commit 55e7393c.
This need to be done in the GUIs
parent 96f03c9a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 17 deletions
modules/video_output/directx/direct3d.c
View file @ 12e13887
...@@ -528,10 +528,6 @@ static int Manage( vout_thread_t *p_vout ) ...@@ -528,10 +528,6 @@ static int Manage( vout_thread_t *p_vout )
val.b_bool = p_vout->b_fullscreen; val.b_bool = p_vout->b_fullscreen;
var_Set( p_vout, "fullscreen", val ); var_Set( p_vout, "fullscreen", val );
/* Disable video-on-top while in fullscreen mode */
if( var_GetBool( p_vout, "video-on-top" ) )
ControlParentWindow( p_vout, VOUT_SET_STAY_ON_TOP, !val.b_bool );
p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE; p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
p_vout->p_sys->i_changes &= ~VOUT_FULLSCREEN_CHANGE; p_vout->p_sys->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
} }
......
modules/video_output/directx/directx.c
View file @ 12e13887
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout.c: Windows DirectX video output display method * vout.c: Windows DirectX video output display method
***************************************************************************** *****************************************************************************
* Copyright (C) 2001-2004 the VideoLAN team * Copyright (C) 2001-2004 the VideoLAN team
* $Id: c7fe3e9667dbb25d2b5e84557dad373d0bb754ab $ * $Id$
* *
* Authors: Gildas Bazin <gbazin@videolan.org> * Authors: Gildas Bazin <gbazin@videolan.org>
* *
...@@ -714,10 +714,6 @@ static int Manage( vout_thread_t *p_vout ) ...@@ -714,10 +714,6 @@ static int Manage( vout_thread_t *p_vout )
val.b_bool = p_vout->b_fullscreen; val.b_bool = p_vout->b_fullscreen;
var_Set( p_vout, "fullscreen", val ); var_Set( p_vout, "fullscreen", val );
/* Disable video-on-top while in fullscreen mode */
if( var_GetBool( p_vout, "video-on-top" ) )
ControlParentWindow( p_vout, VOUT_SET_STAY_ON_TOP, !val.b_bool );
p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE; p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
p_vout->p_sys->i_changes &= ~VOUT_FULLSCREEN_CHANGE; p_vout->p_sys->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
} }
......
modules/video_output/directx/glwin32.c
View file @ 12e13887
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* glwin32.c: Windows OpenGL provider * glwin32.c: Windows OpenGL provider
***************************************************************************** *****************************************************************************
* Copyright (C) 2001-2004 the VideoLAN team * Copyright (C) 2001-2004 the VideoLAN team
* $Id: 413950d2dad41d48d5b411aa8cdfb7b35f88033b $ * $Id$
* *
* Authors: Gildas Bazin <gbazin@videolan.org> * Authors: Gildas Bazin <gbazin@videolan.org>
* *
...@@ -406,10 +406,6 @@ static int Manage( vout_thread_t *p_vout ) ...@@ -406,10 +406,6 @@ static int Manage( vout_thread_t *p_vout )
val.b_bool = p_vout->b_fullscreen; val.b_bool = p_vout->b_fullscreen;
var_Set( p_vout, "fullscreen", val ); var_Set( p_vout, "fullscreen", val );
/* Disable video-on-top while in fullscreen mode */
if( var_GetBool( p_vout, "video-on-top" ) )
ControlParentWindow( p_vout, VOUT_SET_STAY_ON_TOP, !val.b_bool );
p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE; p_vout->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
p_vout->p_sys->i_changes &= ~VOUT_FULLSCREEN_CHANGE; p_vout->p_sys->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
} }
......
modules/video_output/x11/xcommon.c
View file @ 12e13887
...@@ -907,9 +907,6 @@ static int ManageVideo( vout_thread_t *p_vout ) ...@@ -907,9 +907,6 @@ static int ManageVideo( vout_thread_t *p_vout )
* instead of doing it via the fullscreen callback. That's got to * instead of doing it via the fullscreen callback. That's got to
* be the correct one. * be the correct one.
*/ */
if( var_GetBool( p_vout, "video-on-top" ) )
WindowOnTop( p_vout, !val.b_bool );
#ifdef MODULE_NAME_IS_xvmc #ifdef MODULE_NAME_IS_xvmc
xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock ); xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock );
#endif #endif
......
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