# HG changeset patch # User ib # Date 1359112451 0 # Node ID 6d576acb772bc12d04b97300e6ec4dee0b76c4a9 # Parent 85d45ea7ba5d934397bf3e77149f6ea368065cfa Relocate uiLoadPlay. It's a general ui variable and not really related to the main window. Additionally, remove unnecessary initialization. diff -r 85d45ea7ba5d -r 6d576acb772b gui/dialog/fileselect.c --- a/gui/dialog/fileselect.c Fri Jan 25 10:55:19 2013 +0000 +++ b/gui/dialog/fileselect.c Fri Jan 25 11:14:11 2013 +0000 @@ -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" diff -r 85d45ea7ba5d -r 6d576acb772b gui/ui/actions.c --- a/gui/ui/actions.c Fri Jan 25 10:55:19 2013 +0000 +++ b/gui/ui/actions.c Fri Jan 25 11:14:11 2013 +0000 @@ -59,6 +59,8 @@ #define GUI_REDRAW_WAIT 375 // in milliseconds +int uiLoadPlay; + static unsigned int last_redraw_time; /** diff -r 85d45ea7ba5d -r 6d576acb772b gui/ui/actions.h --- a/gui/ui/actions.h Fri Jan 25 10:55:19 2013 +0000 +++ b/gui/ui/actions.h Fri Jan 25 11:14:11 2013 +0000 @@ -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); diff -r 85d45ea7ba5d -r 6d576acb772b gui/ui/main.c --- a/gui/ui/main.c Fri Jan 25 10:55:19 2013 +0000 +++ b/gui/ui/main.c Fri Jan 25 11:14:11 2013 +0000 @@ -56,8 +56,6 @@ unsigned char * mainDrawBuffer = NULL; int uiMainRender = True; -int uiLoadPlay = False; - int mainVisible = True; int boxMoved = False; diff -r 85d45ea7ba5d -r 6d576acb772b gui/ui/ui.h --- a/gui/ui/ui.h Fri Jan 25 10:55:19 2013 +0000 +++ b/gui/ui/ui.h Fri Jan 25 11:14:11 2013 +0000 @@ -23,7 +23,6 @@ extern unsigned char * menuDrawBuffer; extern int mainVisible; -extern int uiLoadPlay; extern int uiMainRender; extern int uiPlaybarFade;