[MPlayer-cvslog] r35866 - in trunk/gui: dialog/fileselect.c dialog/menu.c dialog/url.c interface.c ui/actions.h ui/menu.c ui/ui.h

[ib]

Author: ib
Date: Fri Jan 25 11:28:38 2013
New Revision: 35866

Log:
Relocate uiMainEvent() prototype.

Modified:
   trunk/gui/dialog/fileselect.c
   trunk/gui/dialog/menu.c
   trunk/gui/dialog/url.c
   trunk/gui/interface.c
   trunk/gui/ui/actions.h
   trunk/gui/ui/menu.c
   trunk/gui/ui/ui.h

Modified: trunk/gui/dialog/fileselect.c
==============================================================================
--- trunk/gui/dialog/fileselect.c	Fri Jan 25 11:18:13 2013	(r35865)
+++ trunk/gui/dialog/fileselect.c	Fri Jan 25 11:28:38 2013	(r35866)
@@ -24,6 +24,7 @@
 #include <unistd.h>
 
 #include "config.h"
+#include "gui/ui/actions.h"
 #include "gui/ui/ui.h"
 
 #include "pixmaps/up.xpm"

Modified: trunk/gui/dialog/menu.c
==============================================================================
--- trunk/gui/dialog/menu.c	Fri Jan 25 11:18:13 2013	(r35865)
+++ trunk/gui/dialog/menu.c	Fri Jan 25 11:28:38 2013	(r35866)
@@ -28,7 +28,7 @@
 
 #include "menu.h"
 #include "dialog.h"
-#include "gui/ui/ui.h"
+#include "gui/ui/actions.h"
 #include "gui/app/app.h"
 #include "gui/app/gui.h"
 #include "gui/interface.h"

Modified: trunk/gui/dialog/url.c
==============================================================================
--- trunk/gui/dialog/url.c	Fri Jan 25 11:18:13 2013	(r35865)
+++ trunk/gui/dialog/url.c	Fri Jan 25 11:28:38 2013	(r35866)
@@ -30,7 +30,7 @@
 #include "tools.h"
 #include "gui/interface.h"
 #include "gui/app/app.h"
-#include "gui/ui/ui.h"
+#include "gui/ui/actions.h"
 #include "dialog.h"
 #include "gui/util/list.h"
 #include "gui/util/string.h"

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Fri Jan 25 11:18:13 2013	(r35865)
+++ trunk/gui/interface.c	Fri Jan 25 11:28:38 2013	(r35866)
@@ -26,6 +26,7 @@
 #include "app/gui.h"
 #include "dialog/dialog.h"
 #include "skin/skin.h"
+#include "ui/actions.h"
 #include "ui/ui.h"
 #include "util/list.h"
 #include "util/mem.h"

Modified: trunk/gui/ui/actions.h
==============================================================================
--- trunk/gui/ui/actions.h	Fri Jan 25 11:18:13 2013	(r35865)
+++ trunk/gui/ui/actions.h	Fri Jan 25 11:28:38 2013	(r35866)
@@ -22,6 +22,7 @@
 void uiAbsSeek(float sec);
 void uiChangeSkin(char *name);
 void uiCurr(void);
+void uiMainEvent(int msg, float param);
 void uiFullScreen(void);
 void uiNext(void);
 void uiPause(void);

Modified: trunk/gui/ui/menu.c
==============================================================================
--- trunk/gui/ui/menu.c	Fri Jan 25 11:18:13 2013	(r35865)
+++ trunk/gui/ui/menu.c	Fri Jan 25 11:28:38 2013	(r35866)
@@ -27,6 +27,7 @@
 #include "mp_msg.h"
 #include "gui/app/app.h"
 #include "gui/app/gui.h"
+#include "actions.h"
 #include "ui.h"
 
 #include "gui/dialog/dialog.h"

Modified: trunk/gui/ui/ui.h
==============================================================================
--- trunk/gui/ui/ui.h	Fri Jan 25 11:18:13 2013	(r35865)
+++ trunk/gui/ui/ui.h	Fri Jan 25 11:28:38 2013	(r35866)
@@ -30,7 +30,6 @@ extern int             uiPlaybarFade;
 extern int             sx, sy;
 
 void uiMainDraw( void );
-void uiMainEvent( int msg, float param );
 void uiMainMouse( int Button, int X, int Y, int RX, int RY );
 void uiMainKey( int KeyCode, int Type, int Key );
 void uiMainDND(int num, char** files);