[Mplayer-cvslog] CVS: main/libvo vo_3dfx.c, 1.17, 1.18 vo_dxr3.c, 1.120, 1.121 vo_x11.c, 1.139, 1.140 vo_xmga.c, 1.88, 1.89 vo_xover.c, 1.8, 1.9 vo_xv.c, 1.153, 1.154 vo_xvidix.c, 1.68, 1.69 vo_xvmc.c, 1.10, 1.11

[Alexander Strasser beastd]

CVS change done by Alexander Strasser (beastd)

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv19638/libvo

Modified Files:
	vo_3dfx.c vo_dxr3.c vo_x11.c vo_xmga.c vo_xover.c vo_xv.c 
	vo_xvidix.c vo_xvmc.c 
Log Message:
Removed superfluous XFlush calls before XSync.

Original patch by Piotr Neuman <sikkh at wp.pl> 
extended by Joey to cover all X11 code
modified by me to only do the above stated change.


Index: vo_3dfx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_3dfx.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- vo_3dfx.c	3 Oct 2003 22:33:06 -0000	1.17
+++ vo_3dfx.c	20 Aug 2004 09:41:13 -0000	1.18
@@ -204,7 +204,6 @@
 
 	XSelectInput(display, mywindow, NoEventMask);
 
-	XFlush(display);
 	XSync(display, False);
 
 	return 0;

Index: vo_dxr3.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dxr3.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- vo_dxr3.c	25 Jun 2004 16:49:51 -0000	1.120
+++ vo_dxr3.c	20 Aug 2004 09:41:13 -0000	1.121
@@ -634,7 +634,6 @@
 			XSetStandardProperties(mDisplay, vo_window, "DXR3 Overlay", "DXR3 Overlay", None, NULL, 0, &hint);
 			XSetWMNormalHints(mDisplay, vo_window, &hint);
 			XMapWindow(mDisplay, vo_window);
-			XFlush(mDisplay);
 			XSync(mDisplay, False);
 		}
 		

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- vo_x11.c	25 Jul 2004 12:49:01 -0000	1.139
+++ vo_x11.c	20 Aug 2004 09:41:13 -0000	1.140
@@ -425,7 +425,6 @@
                                   vo_dwidth, vo_dheight);
         }
 
-        XFlush(mDisplay);
         XSync(mDisplay, False);
 
         // we cannot grab mouse events on root window :(

Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- vo_xmga.c	25 Jul 2004 12:49:01 -0000	1.88
+++ vo_xmga.c	20 Aug 2004 09:41:13 -0000	1.89
@@ -275,7 +275,6 @@
     if (vo_ontop)
         vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
 
-    XFlush(mDisplay);
     XSync(mDisplay, False);
 
     ioctl(f, MGA_VID_ON, 0);

Index: vo_xover.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xover.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vo_xover.c	25 Jul 2004 12:49:01 -0000	1.8
+++ vo_xover.c	20 Aug 2004 09:41:13 -0000	1.9
@@ -347,7 +347,6 @@
 
   set_window(1);
 
-  XFlush(mDisplay);
   XSync(mDisplay, False);
 
   panscan_calc();

Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- vo_xv.c	25 Jul 2004 12:49:01 -0000	1.153
+++ vo_xv.c	20 Aug 2004 09:41:13 -0000	1.154
@@ -348,7 +348,6 @@
         if (vo_gc != None)
             XFreeGC(mDisplay, vo_gc);
         vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv);
-        XFlush(mDisplay);
         XSync(mDisplay, False);
 #ifdef HAVE_XF86VM
         if (vm)
@@ -512,7 +511,6 @@
     }
     XFree(xvimage[foo]);
 
-    XFlush(mDisplay);
     XSync(mDisplay, False);
     return;
 }

Index: vo_xvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvidix.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- vo_xvidix.c	25 Jul 2004 12:49:01 -0000	1.68
+++ vo_xvidix.c	20 Aug 2004 09:41:13 -0000	1.69
@@ -411,7 +411,6 @@
 
     set_window(1);
 
-    XFlush(mDisplay);
     XSync(mDisplay, False);
 
     panscan_calc();

Index: vo_xvmc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvmc.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vo_xvmc.c	25 Jul 2004 12:49:01 -0000	1.10
+++ vo_xvmc.c	20 Aug 2004 09:41:13 -0000	1.11
@@ -189,7 +189,6 @@
    }
    XFree(xvimage);
 
-   XFlush( mDisplay );
    XSync(mDisplay, False);
    return;
 }
@@ -762,7 +761,6 @@
 
       if ( vo_gc != None ) XFreeGC( mDisplay,vo_gc );
       vo_gc = XCreateGC(mDisplay, vo_window, GCForeground, &xgcv);
-      XFlush(mDisplay);
       XSync(mDisplay, False);
 #ifdef HAVE_XF86VM
       if ( vm )