[MPlayer-cvslog] r35851 - in trunk/gui: interface.c ui/ui.h ui/video.c

[ib]

Author: ib
Date: Thu Jan 24 17:06:48 2013
New Revision: 35851

Log:
Get rid of uiVideoRender.

Directly use guiInfo.Playing instead.

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

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Thu Jan 24 16:59:24 2013	(r35850)
+++ trunk/gui/interface.c	Thu Jan 24 17:06:48 2013	(r35851)
@@ -229,8 +229,6 @@ void guiInit(void)
 
     guiInfo.Playing = GUI_STOP;
 
-    uiVideoRender = True;
-
     playlist = listMgr(PLAYLIST_ITEM_GET_CURR, 0);
 
     if (playlist && !filename) {
@@ -268,7 +266,6 @@ void guiDone(void)
 
         cfg_write();
 
-        uiVideoRender = False;
         uiMainRender  = False;
 
         // NOTE TO MYSELF: destroy the windows
@@ -874,7 +871,6 @@ int gui(int what, void *data)
             gui(GUI_SET_STATE, (void *)GUI_STOP);
 
             wsEvents();
-            uiVideoRender = True;
             wsWindowRedraw(&guiApp.videoWindow);
             wsMouseVisibility(&guiApp.videoWindow, wsShowMouseCursor);
         }

Modified: trunk/gui/ui/ui.h
==============================================================================
--- trunk/gui/ui/ui.h	Thu Jan 24 16:59:24 2013	(r35850)
+++ trunk/gui/ui/ui.h	Thu Jan 24 17:06:48 2013	(r35851)
@@ -19,7 +19,6 @@
 #ifndef MPLAYER_GUI_UI_H
 #define MPLAYER_GUI_UI_H
 
-extern int             uiVideoRender;
 extern int             uiMainRender;
 
 extern unsigned char * mainDrawBuffer;

Modified: trunk/gui/ui/video.c
==============================================================================
--- trunk/gui/ui/video.c	Thu Jan 24 16:59:24 2013	(r35850)
+++ trunk/gui/ui/video.c	Thu Jan 24 17:06:48 2013	(r35851)
@@ -30,7 +30,6 @@
 #include "gui/interface.h"
 #include "gui/dialog/dialog.h"
 
-int             uiVideoRender = False;
 int             videoVisible = 0;
 
 void uiVideoDraw( void )
@@ -41,11 +40,10 @@ void uiVideoDraw( void )
  if ( guiApp.videoWindow.State == wsWindowFocusOut && metacity_hack != 3 ) videoVisible--;
 
  if ( !guiApp.videoWindow.Mapped ||
-      guiApp.videoWindow.Visible == wsWindowNotVisible ) return;
-
- if ( guiInfo.Playing ) uiVideoRender=False;
+      guiApp.videoWindow.Visible == wsWindowNotVisible ||
+      guiInfo.Playing) return;
 
- if ( uiVideoRender && guiApp.videoWindow.State == wsWindowExpose )
+ if ( guiApp.videoWindow.State == wsWindowExpose )
   {
    wsWindowBackground(&guiApp.videoWindow, guiApp.video.R, guiApp.video.G, guiApp.video.B);
    if ( guiApp.video.Bitmap.Image ) wsImageDraw( &guiApp.videoWindow );