From 06be6b71350c409aeff43e7fe87a78f2995075cf Mon Sep 17 00:00:00 2001 From: al Date: Fri, 20 Aug 2004 09:41:13 +0000 Subject: Removed superfluous XFlush calls before XSync. Original patch by Piotr Neuman extended by Joey to cover all X11 code modified by me to only do the above stated change. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13057 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_3dfx.c | 1 - libvo/vo_dxr3.c | 1 - libvo/vo_x11.c | 1 - libvo/vo_xmga.c | 1 - libvo/vo_xover.c | 1 - libvo/vo_xv.c | 2 -- libvo/vo_xvidix.c | 1 - libvo/vo_xvmc.c | 2 -- 8 files changed, 10 deletions(-) diff --git a/libvo/vo_3dfx.c b/libvo/vo_3dfx.c index 59b8bf1906..26d50fe8d1 100644 --- a/libvo/vo_3dfx.c +++ b/libvo/vo_3dfx.c @@ -204,7 +204,6 @@ create_window(Display *display, char *title) XSelectInput(display, mywindow, NoEventMask); - XFlush(display); XSync(display, False); return 0; diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c index 99518a0327..0266c873ee 100644 --- a/libvo/vo_dxr3.c +++ b/libvo/vo_dxr3.c @@ -634,7 +634,6 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32 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); } diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 07f4431934..15ff744890 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -425,7 +425,6 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, vo_dwidth, vo_dheight); } - XFlush(mDisplay); XSync(mDisplay, False); // we cannot grab mouse events on root window :( diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c index f5d4f1ef77..b9cd6cadd4 100644 --- a/libvo/vo_xmga.c +++ b/libvo/vo_xmga.c @@ -275,7 +275,6 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop); - XFlush(mDisplay); XSync(mDisplay, False); ioctl(f, MGA_VID_ON, 0); diff --git a/libvo/vo_xover.c b/libvo/vo_xover.c index 7ed6ccb614..e0f317f8e9 100644 --- a/libvo/vo_xover.c +++ b/libvo/vo_xover.c @@ -347,7 +347,6 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, set_window(1); - XFlush(mDisplay); XSync(mDisplay, False); panscan_calc(); diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 540003b67a..0296206cf4 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -348,7 +348,6 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, 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 @@ static void deallocate_xvimage(int foo) } XFree(xvimage[foo]); - XFlush(mDisplay); XSync(mDisplay, False); return; } diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c index 786cacd6b9..8cab15fd58 100644 --- a/libvo/vo_xvidix.c +++ b/libvo/vo_xvidix.c @@ -411,7 +411,6 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, set_window(1); - XFlush(mDisplay); XSync(mDisplay, False); panscan_calc(); diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c index 3a620ce8b6..cd22ecc2ba 100644 --- a/libvo/vo_xvmc.c +++ b/libvo/vo_xvmc.c @@ -189,7 +189,6 @@ static void deallocate_xvimage() } XFree(xvimage); - XFlush( mDisplay ); XSync(mDisplay, False); return; } @@ -762,7 +761,6 @@ found_subpic: 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 ) -- cgit v1.2.3