[MPlayer-cvslog] r35833 - in trunk/gui: interface.c ui/actions.c ui/video.c

[ib]

Author: ib
Date: Wed Jan 23 15:36:36 2013
New Revision: 35833

Log:
Remove unnecessary wsWindowBackground() calls.

Add a necessary one to the video window's redraw handler.

Modified:
   trunk/gui/interface.c
   trunk/gui/ui/actions.c
   trunk/gui/ui/video.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Wed Jan 23 15:25:22 2013	(r35832)
+++ trunk/gui/interface.c	Wed Jan 23 15:36:36 2013	(r35833)
@@ -202,8 +202,6 @@ void guiInit(void)
     guiApp.videoWindow.KeyHandler   = uiMainKeyHandle;
     guiApp.videoWindow.DandDHandler = uiDandDHandler;
 
-    wsWindowBackground(&guiApp.videoWindow, guiApp.video.R, guiApp.video.G, guiApp.video.B);
-
     if (guiApp.video.Bitmap.Image)
         wsImageConvert(&guiApp.videoWindow, guiApp.video.Bitmap.Image);
 
@@ -871,7 +869,6 @@ int gui(int what, void *data)
 
             wsEvents();
             uiVideoRender = True;
-            wsWindowBackground(&guiApp.videoWindow, guiApp.video.R, guiApp.video.G, guiApp.video.B);
             wsWindowRedraw(&guiApp.videoWindow);
             wsMouseVisibility(&guiApp.videoWindow, wsShowMouseCursor);
         }

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Wed Jan 23 15:25:22 2013	(r35832)
+++ trunk/gui/ui/actions.c	Wed Jan 23 15:36:36 2013	(r35833)
@@ -62,11 +62,6 @@ void uiFullScreen(void)
 
     if (guiApp.menuIsPresent)
         wsWindowLayer(wsDisplay, guiApp.menuWindow.WindowID, guiApp.videoWindow.isFullScreen);
-
-    if (guiInfo.Playing)
-        wsWindowBackground(&guiApp.videoWindow, 0, 0, 0);
-    else
-        wsWindowBackground(&guiApp.videoWindow, guiApp.video.R, guiApp.video.G, guiApp.video.B);
 }
 
 /**
@@ -90,7 +85,6 @@ void uiPlay(void)
 
     gui(GUI_SET_STATE, (void *)GUI_PLAY);
     uiVideoRender = False;
-    wsWindowBackground(&guiApp.videoWindow, 0, 0, 0);
 }
 
 /**
@@ -207,7 +201,6 @@ void uiChangeSkin(char *name)
 
     if (!guiInfo.Playing) {
         uiVideoRender = True;
-        wsWindowBackground(&guiApp.videoWindow, guiApp.video.R, guiApp.video.G, guiApp.video.B);
         wsWindowRedraw(&guiApp.videoWindow);
     }
 

Modified: trunk/gui/ui/video.c
==============================================================================
--- trunk/gui/ui/video.c	Wed Jan 23 15:25:22 2013	(r35832)
+++ trunk/gui/ui/video.c	Wed Jan 23 15:36:36 2013	(r35833)
@@ -47,6 +47,7 @@ void uiVideoDraw( void )
 
  if ( uiVideoRender && guiApp.videoWindow.State == wsWindowExpose )
   {
+   wsWindowBackground(&guiApp.videoWindow, guiApp.video.R, guiApp.video.G, guiApp.video.B);
    if ( guiApp.video.Bitmap.Image ) wsImageDraw( &guiApp.videoWindow );
   }
  guiApp.videoWindow.State=0;