Mercurial > mplayer.hg

changeset 35777:6d576acb772b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Relocate uiLoadPlay. It's a general ui variable and not really related to the main window. Additionally, remove unnecessary initialization.
author ib
date Fri, 25 Jan 2013 11:14:11 +0000
parents 85d45ea7ba5d
children 8ba56e7c14fb
files gui/dialog/fileselect.c gui/ui/actions.c gui/ui/actions.h gui/ui/main.c gui/ui/ui.h
diffstat 5 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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"
--- 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;
 
 /**
--- 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);
--- 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;
--- 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;