Mercurial > mplayer.hg
changeset 27903:3da3930bf2ac
Remove explicit setting of vo_ontop since that is already done by vo_x11_create_vo_window
| author | reimar |
|---|---|
| date | Sat, 15 Nov 2008 23:09:31 +0000 |
| parents | db013e54aef5 |
| children | f6d60ccb095f |
| files | libvo/vo_dxr3.c libvo/vo_gl2.c libvo/vo_x11.c libvo/vo_xmga.c libvo/vo_xover.c libvo/vo_xv.c libvo/vo_xvidix.c libvo/vo_xvmc.c |
| diffstat | 8 files changed, 0 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_dxr3.c Sat Nov 15 22:49:49 2008 +0000 +++ b/libvo/vo_dxr3.c Sat Nov 15 23:09:31 2008 +0000 @@ -551,9 +551,6 @@ 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;
--- a/libvo/vo_gl2.c Sat Nov 15 22:49:49 2008 +0000 +++ b/libvo/vo_gl2.c Sat Nov 15 23:09:31 2008 +0000 @@ -670,9 +670,6 @@ 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; }
--- a/libvo/vo_x11.c Sat Nov 15 22:49:49 2008 +0000 +++ b/libvo/vo_x11.c Sat Nov 15 23:09:31 2008 +0000 @@ -507,9 +507,6 @@ 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; }
--- a/libvo/vo_xmga.c Sat Nov 15 22:49:49 2008 +0000 +++ b/libvo/vo_xmga.c Sat Nov 15 23:09:31 2008 +0000 @@ -248,9 +248,6 @@ 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);
--- a/libvo/vo_xover.c Sat Nov 15 22:49:49 2008 +0000 +++ b/libvo/vo_xover.c Sat Nov 15 23:09:31 2008 +0000 @@ -188,8 +188,6 @@ 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);
--- a/libvo/vo_xv.c Sat Nov 15 22:49:49 2008 +0000 +++ b/libvo/vo_xv.c Sat Nov 15 23:09:31 2008 +0000 @@ -336,9 +336,6 @@ 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; }
--- a/libvo/vo_xvidix.c Sat Nov 15 22:49:49 2008 +0000 +++ b/libvo/vo_xvidix.c Sat Nov 15 23:09:31 2008 +0000 @@ -340,9 +340,6 @@ panscan_calc(); - if (vo_ontop) - vo_x11_setlayer(mDisplay, vo_window, vo_ontop); - return 0; }
--- a/libvo/vo_xvmc.c Sat Nov 15 22:49:49 2008 +0000 +++ b/libvo/vo_xvmc.c Sat Nov 15 23:09:31 2008 +0000 @@ -714,8 +714,6 @@ 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 */