[MPlayer-cvslog] r35871 - in trunk/gui: dialog/fileselect.c ui/actions.c ui/actions.h ui/main.c ui/ui.h

[ib]

Author: ib
Date: Fri Jan 25 12:14:11 2013
New Revision: 35871

Log:
Relocate uiLoadPlay.

It's a general ui variable and not really related to the main window.

Additionally, remove unnecessary initialization.

Modified:
   trunk/gui/dialog/fileselect.c
   trunk/gui/ui/actions.c
   trunk/gui/ui/actions.h
   trunk/gui/ui/main.c
   trunk/gui/ui/ui.h

Modified: trunk/gui/dialog/fileselect.c
==============================================================================
--- trunk/gui/dialog/fileselect.c	Fri Jan 25 11:55:19 2013	(r35870)
+++ trunk/gui/dialog/fileselect.c	Fri Jan 25 12:14:11 2013	(r35871)
@@ -25,7 +25,6 @@
 
 #include "config.h"
 #include "gui/ui/actions.h"
-#include "gui/ui/ui.h"
 
 #include "pixmaps/up.xpm"
 #include "pixmaps/dir.xpm"

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Fri Jan 25 11:55:19 2013	(r35870)
+++ trunk/gui/ui/actions.c	Fri Jan 25 12:14:11 2013	(r35871)
@@ -59,6 +59,8 @@
 
 #define GUI_REDRAW_WAIT 375   // in milliseconds
 
+int uiLoadPlay;
+
 static unsigned int last_redraw_time;
 
 /**

Modified: trunk/gui/ui/actions.h
==============================================================================
--- trunk/gui/ui/actions.h	Fri Jan 25 11:55:19 2013	(r35870)
+++ trunk/gui/ui/actions.h	Fri Jan 25 12:14:11 2013	(r35871)
@@ -19,6 +19,8 @@
 #ifndef MPLAYER_GUI_ACTIONS_H
 #define MPLAYER_GUI_ACTIONS_H
 
+extern int uiLoadPlay;
+
 void uiAbsSeek(float sec);
 void uiChangeSkin(char *name);
 void uiCurr(void);

Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c	Fri Jan 25 11:55:19 2013	(r35870)
+++ trunk/gui/ui/main.c	Fri Jan 25 12:14:11 2013	(r35871)
@@ -56,8 +56,6 @@
 unsigned char * mainDrawBuffer = NULL;
 int             uiMainRender = True;
 
-int             uiLoadPlay = False;
-
 int             mainVisible = True;
 
 int             boxMoved = False;

Modified: trunk/gui/ui/ui.h
==============================================================================
--- trunk/gui/ui/ui.h	Fri Jan 25 11:55:19 2013	(r35870)
+++ trunk/gui/ui/ui.h	Fri Jan 25 12:14:11 2013	(r35871)
@@ -23,7 +23,6 @@ extern unsigned char * mainDrawBuffer;
 extern unsigned char * menuDrawBuffer;
 extern int             mainVisible;
 
-extern int             uiLoadPlay;
 extern int             uiMainRender;
 extern int             uiPlaybarFade;