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

[ib]

Author: ib
Date: Fri Nov 23 11:04:26 2012
New Revision: 35451

Log:
Pass guiApp's wsTWindow parameters always by reference (if possible).

(This isn't possible for wsSetIcon(), wsSetLayer() and
wsRaiseWindowTop() by the way, because these need to be
called with a GDK window ID information.)

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

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Fri Nov 23 10:25:54 2012	(r35450)
+++ trunk/gui/interface.c	Fri Nov 23 11:04:26 2012	(r35451)
@@ -191,7 +191,7 @@ void guiInit(void)
     guiApp.videoWindow.DandDHandler = uiDandDHandler;
 
     wsSetBackgroundRGB(&guiApp.videoWindow, guiApp.video.R, guiApp.video.G, guiApp.video.B);
-    wsClearWindow(guiApp.videoWindow);
+    wsClearWindow(&guiApp.videoWindow);
 
     if (guiApp.video.Bitmap.Image)
         wsConvert(&guiApp.videoWindow, guiApp.video.Bitmap.Image);
@@ -823,7 +823,7 @@ int gui(int what, void *data)
             wsHandleEvents();
             uiVideoRender = 1;
             wsSetBackgroundRGB(&guiApp.videoWindow, guiApp.video.R, guiApp.video.G, guiApp.video.B);
-            wsClearWindow(guiApp.videoWindow);
+            wsClearWindow(&guiApp.videoWindow);
             wsPostRedisplay(&guiApp.videoWindow);
             wsVisibleMouse(&guiApp.videoWindow, wsShowMouseCursor);
         }

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Fri Nov 23 10:25:54 2012	(r35450)
+++ trunk/gui/ui/actions.c	Fri Nov 23 11:04:26 2012	(r35451)
@@ -79,7 +79,7 @@ void uiPlay(void)
     gui(GUI_SET_STATE, (void *)GUI_PLAY);
     uiVideoRender = 0;
     wsSetBackgroundRGB(&guiApp.videoWindow, 0, 0, 0);
-    wsClearWindow(guiApp.videoWindow);
+    wsClearWindow(&guiApp.videoWindow);
 }
 
 void uiPause(void)
@@ -169,7 +169,7 @@ void uiChangeSkin(char *name)
     if (!guiInfo.Playing) {
         uiVideoRender = 1;
         wsSetBackgroundRGB(&guiApp.videoWindow, guiApp.video.R, guiApp.video.G, guiApp.video.B);
-        wsClearWindow(guiApp.videoWindow);
+        wsClearWindow(&guiApp.videoWindow);
         wsPostRedisplay(&guiApp.videoWindow);
     }
 

Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c	Fri Nov 23 10:25:54 2012	(r35450)
+++ trunk/gui/ui/main.c	Fri Nov 23 11:04:26 2012	(r35451)
@@ -399,7 +399,7 @@ set_volume:
 	  case 1:
 	  default: movie_aspect=-1;
 	 }
-	wsClearWindow( guiApp.videoWindow );
+	wsClearWindow( &guiApp.videoWindow );
 	if ( guiInfo.StreamType == STREAMTYPE_VCD ) uiEventHandling( evPlayVCD, 0 );
 	 else if ( guiInfo.StreamType == STREAMTYPE_DVD ) uiEventHandling( ivPlayDVD, 0 );
 	 else

Modified: trunk/gui/wm/ws.h
==============================================================================
--- trunk/gui/wm/ws.h	Fri Nov 23 10:25:54 2012	(r35450)
+++ trunk/gui/wm/ws.h	Fri Nov 23 11:04:26 2012	(r35451)
@@ -239,7 +239,7 @@ void wsRaiseWindowTop(Display *dpy, Wind
 void wsSetBackground(wsTWindow *win, int color);
 void wsSetForegroundRGB(wsTWindow *win, int r, int g, int b);
 void wsSetBackgroundRGB(wsTWindow *win, int r, int g, int b);
-#define wsClearWindow(win) XClearWindow(wsDisplay, win.WindowID)
+#define wsClearWindow(win) XClearWindow(wsDisplay, (win)->WindowID)
 void wsSetTitle(wsTWindow *win, char *name);
 void wsVisibleWindow(wsTWindow *win, int show);
 void wsWindowDecoration(wsTWindow *win, long d);