[MPlayer-cvslog] r35832 - in trunk/gui: interface.c ui/actions.c wm/ws.c wm/ws.h

[ib]

Author: ib
Date: Wed Jan 23 15:25:22 2013
New Revision: 35832

Log:
Remove wsWindowClear().

Since it always follows a wsWindowBackground() call, add XClearWindow()
to wsWindowBackground(). wsWindowClear() is obsolete then and can be
removed.

Modified:
   trunk/gui/interface.c
   trunk/gui/ui/actions.c
   trunk/gui/wm/ws.c
   trunk/gui/wm/ws.h

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Wed Jan 23 15:10:24 2013	(r35831)
+++ trunk/gui/interface.c	Wed Jan 23 15:25:22 2013	(r35832)
@@ -203,7 +203,6 @@ void guiInit(void)
     guiApp.videoWindow.DandDHandler = uiDandDHandler;
 
     wsWindowBackground(&guiApp.videoWindow, guiApp.video.R, guiApp.video.G, guiApp.video.B);
-    wsWindowClear(&guiApp.videoWindow);
 
     if (guiApp.video.Bitmap.Image)
         wsImageConvert(&guiApp.videoWindow, guiApp.video.Bitmap.Image);
@@ -873,7 +872,6 @@ int gui(int what, void *data)
             wsEvents();
             uiVideoRender = True;
             wsWindowBackground(&guiApp.videoWindow, guiApp.video.R, guiApp.video.G, guiApp.video.B);
-            wsWindowClear(&guiApp.videoWindow);
             wsWindowRedraw(&guiApp.videoWindow);
             wsMouseVisibility(&guiApp.videoWindow, wsShowMouseCursor);
         }

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Wed Jan 23 15:10:24 2013	(r35831)
+++ trunk/gui/ui/actions.c	Wed Jan 23 15:25:22 2013	(r35832)
@@ -91,7 +91,6 @@ void uiPlay(void)
     gui(GUI_SET_STATE, (void *)GUI_PLAY);
     uiVideoRender = False;
     wsWindowBackground(&guiApp.videoWindow, 0, 0, 0);
-    wsWindowClear(&guiApp.videoWindow);
 }
 
 /**
@@ -209,7 +208,6 @@ void uiChangeSkin(char *name)
     if (!guiInfo.Playing) {
         uiVideoRender = True;
         wsWindowBackground(&guiApp.videoWindow, guiApp.video.R, guiApp.video.G, guiApp.video.B);
-        wsWindowClear(&guiApp.videoWindow);
         wsWindowRedraw(&guiApp.videoWindow);
     }
 

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	Wed Jan 23 15:10:24 2013	(r35831)
+++ trunk/gui/wm/ws.c	Wed Jan 23 15:25:22 2013	(r35832)
@@ -1099,15 +1099,6 @@ void wsWindowBackground(wsWindow *win, i
     }
 
     XSetWindowBackground(wsDisplay, win->WindowID, color);
-}
-
-/**
- * @brief Clear the entire area in a window.
- *
- * @param win pointer to a ws window structure
- */
-void wsWindowClear(wsWindow *win)
-{
     XClearWindow(wsDisplay, win->WindowID);
 }
 

Modified: trunk/gui/wm/ws.h
==============================================================================
--- trunk/gui/wm/ws.h	Wed Jan 23 15:10:24 2013	(r35831)
+++ trunk/gui/wm/ws.h	Wed Jan 23 15:25:22 2013	(r35832)
@@ -172,7 +172,6 @@ void wsWindowResize(wsWindow *win, int w
 void wsWindowIconify(wsWindow *win);
 void wsWindowRaiseTop(Display *display, Window Win);
 void wsWindowBackground(wsWindow *win, int r, int g, int b);
-void wsWindowClear(wsWindow *win);
 void wsWindowVisibility(wsWindow *win, int vis);
 void wsWindowLayer(Display *display, Window Win, Bool fullscreen);
 void wsWindowFullscreen(wsWindow *win);