[vlc-devel] commit: Revert "Disable video-on-top while in fullscreen" ( Rafaël Carré )

[git version control]

vlc | branch: 0.8.6-bugfix | Rafaël Carré <funman at videolan.org> | Sat May 10 19:19:43 2008 +0200| [12e1388713b6f595a8ff8aee8eb5b9793d3b3560]

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

This reverts commit 55e7393cfee2476b26f110101da6827bdfa5a613.
This need to be done in the GUIs

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

 modules/video_output/directx/direct3d.c |    4 ----
 modules/video_output/directx/directx.c  |    6 +-----
 modules/video_output/directx/glwin32.c  |    6 +-----
 modules/video_output/x11/xcommon.c      |    3 ---
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/modules/video_output/directx/direct3d.c b/modules/video_output/directx/direct3d.c
index 3ad5df4..ea70a97 100644
--- a/modules/video_output/directx/direct3d.c
+++ b/modules/video_output/directx/direct3d.c
@@ -528,10 +528,6 @@ 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;
     }
diff --git a/modules/video_output/directx/directx.c b/modules/video_output/directx/directx.c
index ef84903..c7fe3e9 100644
--- a/modules/video_output/directx/directx.c
+++ b/modules/video_output/directx/directx.c
@@ -2,7 +2,7 @@
  * vout.c: Windows DirectX video output display method
  *****************************************************************************
  * Copyright (C) 2001-2004 the VideoLAN team
- * $Id: c7fe3e9667dbb25d2b5e84557dad373d0bb754ab $
+ * $Id$
  *
  * Authors: Gildas Bazin <gbazin at videolan.org>
  *
@@ -714,10 +714,6 @@ 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;
     }
diff --git a/modules/video_output/directx/glwin32.c b/modules/video_output/directx/glwin32.c
index 00b1b62..413950d 100644
--- a/modules/video_output/directx/glwin32.c
+++ b/modules/video_output/directx/glwin32.c
@@ -2,7 +2,7 @@
  * glwin32.c: Windows OpenGL provider
  *****************************************************************************
  * Copyright (C) 2001-2004 the VideoLAN team
- * $Id: 413950d2dad41d48d5b411aa8cdfb7b35f88033b $
+ * $Id$
  *
  * Authors: Gildas Bazin <gbazin at videolan.org>
  *
@@ -406,10 +406,6 @@ 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;
     }
diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c
index ab6ce48..c1b0be5 100644
--- a/modules/video_output/x11/xcommon.c
+++ b/modules/video_output/x11/xcommon.c
@@ -907,9 +907,6 @@ 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