[MPlayer-cvslog] r27937 - in trunk/libvo: vo_dxr3.c vo_gl2.c vo_x11.c vo_xmga.c vo_xover.c vo_xv.c vo_xvidix.c vo_xvmc.c

[reimar]

Author: reimar
Date: Sun Nov 16 00:09:31 2008
New Revision: 27937

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


Modified:
   trunk/libvo/vo_dxr3.c
   trunk/libvo/vo_gl2.c
   trunk/libvo/vo_x11.c
   trunk/libvo/vo_xmga.c
   trunk/libvo/vo_xover.c
   trunk/libvo/vo_xv.c
   trunk/libvo/vo_xvidix.c
   trunk/libvo/vo_xvmc.c

Modified: trunk/libvo/vo_dxr3.c
==============================================================================
--- trunk/libvo/vo_dxr3.c	(original)
+++ trunk/libvo/vo_dxr3.c	Sun Nov 16 00:09:31 2008
@@ -551,9 +551,6 @@ static int config(uint32_t width, uint32
 		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;

Modified: trunk/libvo/vo_gl2.c
==============================================================================
--- trunk/libvo/vo_gl2.c	(original)
+++ trunk/libvo/vo_gl2.c	Sun Nov 16 00:09:31 2008
@@ -670,9 +670,6 @@ config(uint32_t width, uint32_t height, 
 
   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;
 }

Modified: trunk/libvo/vo_x11.c
==============================================================================
--- trunk/libvo/vo_x11.c	(original)
+++ trunk/libvo/vo_x11.c	Sun Nov 16 00:09:31 2008
@@ -507,9 +507,6 @@ static int config(uint32_t width, uint32
     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;
 }
 

Modified: trunk/libvo/vo_xmga.c
==============================================================================
--- trunk/libvo/vo_xmga.c	(original)
+++ trunk/libvo/vo_xmga.c	Sun Nov 16 00:09:31 2008
@@ -248,9 +248,6 @@ static int config(uint32_t width, uint32
 
     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);

Modified: trunk/libvo/vo_xover.c
==============================================================================
--- trunk/libvo/vo_xover.c	(original)
+++ trunk/libvo/vo_xover.c	Sun Nov 16 00:09:31 2008
@@ -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);
 

Modified: trunk/libvo/vo_xv.c
==============================================================================
--- trunk/libvo/vo_xv.c	(original)
+++ trunk/libvo/vo_xv.c	Sun Nov 16 00:09:31 2008
@@ -336,9 +336,6 @@ static int config(uint32_t width, uint32
     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;
 }
 

Modified: trunk/libvo/vo_xvidix.c
==============================================================================
--- trunk/libvo/vo_xvidix.c	(original)
+++ trunk/libvo/vo_xvidix.c	Sun Nov 16 00:09:31 2008
@@ -340,9 +340,6 @@ static int config(uint32_t width, uint32
 
     panscan_calc();
 
-    if (vo_ontop)
-        vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
-
     return 0;
 }
 

Modified: trunk/libvo/vo_xvmc.c
==============================================================================
--- trunk/libvo/vo_xvmc.c	(original)
+++ trunk/libvo/vo_xvmc.c	Sun Nov 16 00:09:31 2008
@@ -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 */