Commit 55e7393c authored by Rafaël Carré's avatar Rafaël Carré

Disable video-on-top while in fullscreen

Really close #1227
parent feb459c3
......@@ -528,6 +528,10 @@ static int Manage( vout_thread_t *p_vout )
val.b_bool = p_vout->b_fullscreen;
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->p_sys->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
}
......
......@@ -2,7 +2,7 @@
* vout.c: Windows DirectX video output display method
*****************************************************************************
* Copyright (C) 2001-2004 the VideoLAN team
* $Id$
* $Id: c7fe3e9667dbb25d2b5e84557dad373d0bb754ab $
*
* Authors: Gildas Bazin <gbazin@videolan.org>
*
......@@ -714,6 +714,10 @@ static int Manage( vout_thread_t *p_vout )
val.b_bool = p_vout->b_fullscreen;
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->p_sys->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
}
......
......@@ -2,7 +2,7 @@
* glwin32.c: Windows OpenGL provider
*****************************************************************************
* Copyright (C) 2001-2004 the VideoLAN team
* $Id$
* $Id: 413950d2dad41d48d5b411aa8cdfb7b35f88033b $
*
* Authors: Gildas Bazin <gbazin@videolan.org>
*
......@@ -406,6 +406,10 @@ static int Manage( vout_thread_t *p_vout )
val.b_bool = p_vout->b_fullscreen;
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->p_sys->i_changes &= ~VOUT_FULLSCREEN_CHANGE;
}
......
......@@ -907,6 +907,9 @@ static int ManageVideo( vout_thread_t *p_vout )
* instead of doing it via the fullscreen callback. That's got to
* be the correct one.
*/
if( var_GetBool( p_vout, "video-on-top" ) )
WindowOnTop( p_vout, !val.b_bool );
#ifdef MODULE_NAME_IS_xvmc
xvmc_context_reader_unlock( &p_vout->p_sys->xvmc_lock );
#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