[MPlayer-cvslog] r35622 - in trunk/gui: dialog/fileselect.c dialog/menu.c dialog/preferences.c dialog/url.c interface.c ui/actions.c ui/gmplayer.h ui/main.c ui/menu.c ui/playbar.c ui/ui.h ui/video.c win32/gui.c win...

Thu Dec 6 15:59:06 CET 2012

Author: ib
Date: Thu Dec  6 15:59:06 2012
New Revision: 35622

Log:
Rebuild GUI directory structure.

Rename ui/gmplayer.h ui/ui.h.

Added:
   trunk/gui/ui/ui.h
      - copied, changed from r35621, trunk/gui/ui/gmplayer.h
Deleted:
   trunk/gui/ui/gmplayer.h
Modified:
   trunk/gui/dialog/fileselect.c
   trunk/gui/dialog/menu.c
   trunk/gui/dialog/preferences.c
   trunk/gui/dialog/url.c
   trunk/gui/interface.c
   trunk/gui/ui/actions.c
   trunk/gui/ui/main.c
   trunk/gui/ui/menu.c
   trunk/gui/ui/playbar.c
   trunk/gui/ui/video.c
   trunk/gui/win32/gui.c
   trunk/gui/win32/interface.c
   trunk/gui/win32/preferences.c
   trunk/gui/win32/wincfg.c

Modified: trunk/gui/dialog/fileselect.c
==============================================================================

--- trunk/gui/dialog/fileselect.c	Thu Dec  6 15:32:33 2012	(r35621)
+++ trunk/gui/dialog/fileselect.c	Thu Dec  6 15:59:06 2012	(r35622)
@@ -24,7 +24,7 @@
 #include <unistd.h>
 
 #include "config.h"
-#include "gui/ui/gmplayer.h"
+#include "gui/ui/ui.h"
 
 #include "pixmaps/up.xpm"
 #include "pixmaps/dir.xpm"

Modified: trunk/gui/dialog/menu.c
==============================================================================
--- trunk/gui/dialog/menu.c	Thu Dec  6 15:32:33 2012	(r35621)
+++ trunk/gui/dialog/menu.c	Thu Dec  6 15:59:06 2012	(r35622)
@@ -28,7 +28,7 @@
 
 #include "menu.h"
 #include "gui/ui/widgets.h"
-#include "gui/ui/gmplayer.h"
+#include "gui/ui/ui.h"
 #include "gui/app/app.h"
 #include "gui/app/gui.h"
 #include "gui/interface.h"

Modified: trunk/gui/dialog/preferences.c
==============================================================================
--- trunk/gui/dialog/preferences.c	Thu Dec  6 15:32:33 2012	(r35621)
+++ trunk/gui/dialog/preferences.c	Thu Dec  6 15:59:06 2012	(r35622)
@@ -43,7 +43,7 @@
 #include "gui/app/cfg.h"
 #include "gui/app/gui.h"
 #include "gui/interface.h"
-#include "gui/ui/gmplayer.h"
+#include "gui/ui/ui.h"
 #include "gui/ui/widgets.h"
 #include "gui/util/list.h"
 #include "gui/util/mem.h"

Modified: trunk/gui/dialog/url.c
==============================================================================
--- trunk/gui/dialog/url.c	Thu Dec  6 15:32:33 2012	(r35621)
+++ trunk/gui/dialog/url.c	Thu Dec  6 15:59:06 2012	(r35622)
@@ -30,7 +30,7 @@
 #include "tools.h"
 #include "gui/interface.h"
 #include "gui/app/app.h"
-#include "gui/ui/gmplayer.h"
+#include "gui/ui/ui.h"
 #include "gui/ui/widgets.h"
 #include "gui/util/list.h"
 #include "gui/util/string.h"

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Thu Dec  6 15:32:33 2012	(r35621)
+++ trunk/gui/interface.c	Thu Dec  6 15:59:06 2012	(r35622)
@@ -25,7 +25,7 @@
 #include "app/app.h"
 #include "app/gui.h"
 #include "skin/skin.h"
-#include "ui/gmplayer.h"
+#include "ui/ui.h"
 #include "ui/widgets.h"
 #include "util/list.h"
 #include "util/mem.h"

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Thu Dec  6 15:32:33 2012	(r35621)
+++ trunk/gui/ui/actions.c	Thu Dec  6 15:59:06 2012	(r35622)
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #include "actions.h"
-#include "gmplayer.h"
+#include "ui.h"
 #include "gui/app/app.h"
 #include "gui/app/gui.h"
 #include "gui/interface.h"

Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c	Thu Dec  6 15:32:33 2012	(r35621)
+++ trunk/gui/ui/main.c	Thu Dec  6 15:59:06 2012	(r35622)
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #include "config.h"
-#include "gmplayer.h"
+#include "ui.h"
 #include "gui/app/app.h"
 #include "gui/app/gui.h"
 #include "gui/interface.h"

Modified: trunk/gui/ui/menu.c
==============================================================================
--- trunk/gui/ui/menu.c	Thu Dec  6 15:32:33 2012	(r35621)
+++ trunk/gui/ui/menu.c	Thu Dec  6 15:59:06 2012	(r35622)
@@ -27,7 +27,7 @@
 #include "mp_msg.h"
 #include "gui/app/app.h"
 #include "gui/app/gui.h"
-#include "gmplayer.h"
+#include "ui.h"
 
 #include "widgets.h"
 

Modified: trunk/gui/ui/playbar.c
==============================================================================
--- trunk/gui/ui/playbar.c	Thu Dec  6 15:32:33 2012	(r35621)
+++ trunk/gui/ui/playbar.c	Thu Dec  6 15:59:06 2012	(r35622)
@@ -45,7 +45,7 @@
 #include "libmpdemux/stheader.h"
 #include "codec-cfg.h"
 
-#include "gmplayer.h"
+#include "ui.h"
 #include "actions.h"
 #include "widgets.h"
 #include "render.h"

Copied and modified: trunk/gui/ui/ui.h (from r35621, trunk/gui/ui/gmplayer.h)
==============================================================================
--- trunk/gui/ui/gmplayer.h	Thu Dec  6 15:32:33 2012	(r35621, copy source)
+++ trunk/gui/ui/ui.h	Thu Dec  6 15:59:06 2012	(r35622)
@@ -16,8 +16,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPLAYER_GUI_GMPLAYER_H
-#define MPLAYER_GUI_GMPLAYER_H
+#ifndef MPLAYER_GUI_UI_H
+#define MPLAYER_GUI_UI_H
 
 extern int             uiVideoRender;
 extern int             uiMainRender;
@@ -50,4 +50,4 @@ void uiMenuMouseHandle( int RX, int RY )
 void uiPlaybarInit( void );
 void uiPlaybarShow( int y );
 
-#endif /* MPLAYER_GUI_GMPLAYER_H */
+#endif /* MPLAYER_GUI_UI_H */

Modified: trunk/gui/ui/video.c
==============================================================================
--- trunk/gui/ui/video.c	Thu Dec  6 15:32:33 2012	(r35621)
+++ trunk/gui/ui/video.c	Thu Dec  6 15:59:06 2012	(r35622)
@@ -24,7 +24,7 @@
 #include "help_mp.h"
 #include "mp_core.h"
 
-#include "gmplayer.h"
+#include "ui.h"
 #include "gui/app/app.h"
 #include "gui/app/gui.h"
 #include "gui/interface.h"

Modified: trunk/gui/win32/gui.c
==============================================================================
--- trunk/gui/win32/gui.c	Thu Dec  6 15:32:33 2012	(r35621)
+++ trunk/gui/win32/gui.c	Thu Dec  6 15:59:06 2012	(r35622)
@@ -43,7 +43,7 @@
 #include "libmpcodecs/vd.h"
 #include "gui/interface.h"
 #include "gui/ui/actions.h"
-#include "gui/ui/gmplayer.h"
+#include "gui/ui/ui.h"
 #include "gui/util/mem.h"
 #include "gui.h"
 #include "dialogs.h"

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Thu Dec  6 15:32:33 2012	(r35621)
+++ trunk/gui/win32/interface.c	Thu Dec  6 15:59:06 2012	(r35622)
@@ -62,7 +62,7 @@
 #include "libmpcodecs/vd.h"
 #include "libmpcodecs/dec_audio.h"
 #include "gui/ui/actions.h"
-#include "gui/ui/gmplayer.h"
+#include "gui/ui/ui.h"
 #include "gui/util/mem.h"
 #include "gui/util/list.h"
 #include "gui/util/string.h"

Modified: trunk/gui/win32/preferences.c
==============================================================================
--- trunk/gui/win32/preferences.c	Thu Dec  6 15:32:33 2012	(r35621)
+++ trunk/gui/win32/preferences.c	Thu Dec  6 15:59:06 2012	(r35622)
@@ -32,7 +32,7 @@
 #include "osdep/priority.h"
 #include "mixer.h"
 #include "gui/util/list.h"
-#include "gui/ui/gmplayer.h"
+#include "gui/ui/ui.h"
 #include "gui/interface.h"
 #include "gui.h"
 #include "mp_msg.h"

Modified: trunk/gui/win32/wincfg.c
==============================================================================
--- trunk/gui/win32/wincfg.c	Thu Dec  6 15:32:33 2012	(r35621)
+++ trunk/gui/win32/wincfg.c	Thu Dec  6 15:59:06 2012	(r35622)
@@ -34,7 +34,7 @@
 #include "libvo/video_out.h"
 #include "osdep/priority.h"
 #include "mixer.h"
-#include "gui/ui/gmplayer.h"
+#include "gui/ui/ui.h"
 #include "gui/interface.h"
 #include "gui.h"
 
