Remove explicit setting of vo_ontop since that is already done by vo_x11_create_vo_window

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27937 b3059339-0415-0410-9bf9-f77b7e298cf2

8 files changed, 0 insertions, 22 deletions

diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c
index 82b3d3c779..a3ee6573c8 100644
--- a/libvo/vo_dxr3.c
+++ b/libvo/vo_dxr3.c
@@ -551,9 +551,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_
 		overlay_set_mode(overlay_data, EM8300_OVERLAY_MODE_OVERLAY);
 		overlay_set_mode(overlay_data, EM8300_OVERLAY_MODE_RECTANGLE);
 	}
-
-	if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
-
 #endif
 
 	return 0;
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c
index 09d7e23de6..2cb7a72f21 100644
--- a/libvo/vo_gl2.c
+++ b/libvo/vo_gl2.c
@@ -670,9 +670,6 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
 
   if (initGl(vo_dwidth, vo_dheight) == -1)
     return -1;
-#ifndef GL_WIN32
-  if (vo_ontop) vo_x11_setlayer(mDisplay,vo_window, vo_ontop);
-#endif
 
   return 0;
 }
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index 9090b87b32..bc13e5d601 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -507,9 +507,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
     dst_width = width;
     //printf( "X11 bpp: %d  color mask:  R:%lX  G:%lX  B:%lX\n",bpp,myximage->red_mask,myximage->green_mask,myximage->blue_mask );
 
-    if (vo_ontop)
-        vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
-
     return 0;
 }
 
diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c
index 0a91b57415..96d400866b 100644
--- a/libvo/vo_xmga.c
+++ b/libvo/vo_xmga.c
@@ -248,9 +248,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
 
     set_window();               // set up mga_vid_config.dest_width etc
 
-    if (vo_ontop)
-        vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
-
     XSync(mDisplay, False);
 
     ioctl(f, MGA_VID_ON, 0);
diff --git a/libvo/vo_xover.c b/libvo/vo_xover.c
index 0420b2be0e..0d75b780ea 100644
--- a/libvo/vo_xover.c
+++ b/libvo/vo_xover.c
@@ -188,8 +188,6 @@ static void set_window(int force_update)
   XFillRectangle(mDisplay, vo_window, vo_gc, drwX, drwY, drwWidth,
 		 (vo_fs ? drwHeight - 1 : drwHeight));
 
-  if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
-
   /* flush, update drawable */
   XFlush(mDisplay);
 
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c
index f18c64f40f..67ec61b485 100644
--- a/libvo/vo_xv.c
+++ b/libvo/vo_xv.c
@@ -336,9 +336,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
     mp_msg(MSGT_VO, MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n", drwX,
            drwY, vo_dwidth, vo_dheight);
 
-    if (vo_ontop)
-        vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
-
     return 0;
 }
 
diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c
index 704db31bde..19fc047437 100644
--- a/libvo/vo_xvidix.c
+++ b/libvo/vo_xvidix.c
@@ -340,9 +340,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
 
     panscan_calc();
 
-    if (vo_ontop)
-        vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
-
     return 0;
 }
 
diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c
index 4124453794..d01c123bdb 100644
--- a/libvo/vo_xvmc.c
+++ b/libvo/vo_xvmc.c
@@ -714,8 +714,6 @@ skip_surface_allocation:
 
    mp_msg(MSGT_VO,MSGL_V, "[xvmc] dx: %d dy: %d dw: %d dh: %d\n",drwX,drwY,vo_dwidth,vo_dheight );
 
-   if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
-
 //end vo_xv
 
    /* store image dimesions for displaying */