[MPlayer-cvslog] r35619 - in trunk: Makefile gui/app gui/app.c gui/app.h gui/app/app.c gui/app/app.h gui/app/cfg.c gui/app/cfg.h gui/app/gui.h gui/cfg.c gui/cfg.h gui/gui.h gui/interface.c gui/interface.h gui/skin/...

ib subversion at mplayerhq.hu
Thu Dec 6 14:47:48 CET 2012 

Author: ib
Date: Thu Dec  6 14:47:47 2012
New Revision: 35619

Log:
Rebuild GUI directory structure.

Create new directory app/ and
move app.*, cfg.* and gui.h to app/.

Added:
   trunk/gui/app/
   trunk/gui/app/app.c
      - copied, changed from r35618, trunk/gui/app.c
   trunk/gui/app/app.h
      - copied, changed from r35618, trunk/gui/app.h
   trunk/gui/app/cfg.c
      - copied, changed from r35618, trunk/gui/cfg.c
   trunk/gui/app/cfg.h
      - copied unchanged from r35618, trunk/gui/cfg.h
   trunk/gui/app/gui.h
      - copied unchanged from r35618, trunk/gui/gui.h
Deleted:
   trunk/gui/app.c
   trunk/gui/app.h
   trunk/gui/cfg.c
   trunk/gui/cfg.h
   trunk/gui/gui.h
Modified:
   trunk/Makefile
   trunk/gui/interface.c
   trunk/gui/interface.h
   trunk/gui/skin/font.h
   trunk/gui/skin/skin.c
   trunk/gui/ui/actions.c
   trunk/gui/ui/gtk/about.c
   trunk/gui/ui/gtk/equalizer.c
   trunk/gui/ui/gtk/fileselect.c
   trunk/gui/ui/gtk/menu.c
   trunk/gui/ui/gtk/msgbox.c
   trunk/gui/ui/gtk/playlist.c
   trunk/gui/ui/gtk/preferences.c
   trunk/gui/ui/gtk/skinbrowser.c
   trunk/gui/ui/gtk/url.c
   trunk/gui/ui/main.c
   trunk/gui/ui/menu.c
   trunk/gui/ui/playbar.c
   trunk/gui/ui/render.h
   trunk/gui/ui/video.c
   trunk/gui/ui/widgets.c
   trunk/gui/util/bitmap.c
   trunk/gui/util/list.c
   trunk/gui/util/string.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/Makefile	Thu Dec  6 14:47:47 2012	(r35619)
@@ -497,8 +497,8 @@ SRCS_MPLAYER-$(MATRIXVIEW)   += libvo/vo
 SRCS_MPLAYER-$(GUI)          += gui/util/bitmap.c \
                                 gui/util/list.c \
                                 gui/util/string.c
-SRCS_MPLAYER-$(GUI_GTK)      += gui/app.c \
-                                gui/cfg.c \
+SRCS_MPLAYER-$(GUI_GTK)      += gui/app/app.c \
+                                gui/app/cfg.c \
                                 gui/interface.c \
                                 gui/skin/font.c \
                                 gui/skin/skin.c \
@@ -689,6 +689,7 @@ INSTALL_TARGETS-$(MPLAYER)  += install-m
 
 DIRS =  . \
         gui \
+        gui/app \
         gui/skin \
         gui/ui \
         gui/ui/gtk \

Copied and modified: trunk/gui/app/app.c (from r35618, trunk/gui/app.c)
==============================================================================
--- trunk/gui/app.c	Thu Dec  6 03:30:19 2012	(r35618, copy source)
+++ trunk/gui/app/app.c	Thu Dec  6 14:47:47 2012	(r35619)
@@ -23,7 +23,7 @@
 
 #include "app.h"
 #include "gui.h"
-#include "skin/font.h"
+#include "gui/skin/font.h"
 
 #include "libavutil/common.h"
 

Copied and modified: trunk/gui/app/app.h (from r35618, trunk/gui/app.h)
==============================================================================
--- trunk/gui/app.h	Thu Dec  6 03:30:19 2012	(r35618, copy source)
+++ trunk/gui/app/app.h	Thu Dec  6 14:47:47 2012	(r35619)
@@ -19,8 +19,8 @@
 #ifndef MPLAYER_GUI_APP_H
 #define MPLAYER_GUI_APP_H
 
-#include "util/bitmap.h"
-#include "wm/ws.h"
+#include "gui/util/bitmap.h"
+#include "gui/wm/ws.h"
 
 /// GUI messages (user events)
 enum {

Copied and modified: trunk/gui/app/cfg.c (from r35618, trunk/gui/cfg.c)
==============================================================================
--- trunk/gui/cfg.c	Thu Dec  6 03:30:19 2012	(r35618, copy source)
+++ trunk/gui/app/cfg.c	Thu Dec  6 14:47:47 2012	(r35619)
@@ -22,9 +22,9 @@
 
 #include "cfg.h"
 #include "gui.h"
-#include "interface.h"
-#include "util/list.h"
-#include "util/string.h"
+#include "gui/interface.h"
+#include "gui/util/list.h"
+#include "gui/util/string.h"
 
 #include "config.h"
 #include "help_mp.h"

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/gui/interface.c	Thu Dec  6 14:47:47 2012	(r35619)
@@ -22,8 +22,8 @@
 #include <string.h>
 
 #include "interface.h"
-#include "app.h"
-#include "gui.h"
+#include "app/app.h"
+#include "app/gui.h"
 #include "skin/skin.h"
 #include "ui/gmplayer.h"
 #include "ui/widgets.h"

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/gui/interface.h	Thu Dec  6 14:47:47 2012	(r35619)
@@ -29,7 +29,7 @@
 // These are in support of the non-GUI files that interact with
 // the GUI and that only need to include interface.h for this.
 // ------------------------------------------------------------
-#include "cfg.h"
+#include "app/cfg.h"
 
 extern int use_gui;             // this is defined in mplayer.c
 // ------------------------------------------------------------

Modified: trunk/gui/skin/font.h
==============================================================================
--- trunk/gui/skin/font.h	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/gui/skin/font.h	Thu Dec  6 14:47:47 2012	(r35619)
@@ -19,7 +19,7 @@
 #ifndef MPLAYER_GUI_FONT_H
 #define MPLAYER_GUI_FONT_H
 
-#include "gui/app.h"
+#include "gui/app/app.h"
 #include "gui/util/bitmap.h"
 
 #define ASCII_CHRS 128   // number of ASCII characters

Modified: trunk/gui/skin/skin.c
==============================================================================
--- trunk/gui/skin/skin.c	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/gui/skin/skin.c	Thu Dec  6 14:47:47 2012	(r35619)
@@ -26,8 +26,8 @@
 
 #include "skin.h"
 #include "font.h"
-#include "gui/app.h"
-#include "gui/gui.h"
+#include "gui/app/app.h"
+#include "gui/app/gui.h"
 #include "gui/interface.h"
 #include "gui/ui/widgets.h"
 #include "gui/util/cut.h"

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/gui/ui/actions.c	Thu Dec  6 14:47:47 2012	(r35619)
@@ -26,8 +26,8 @@
 
 #include "actions.h"
 #include "gmplayer.h"
-#include "gui/app.h"
-#include "gui/gui.h"
+#include "gui/app/app.h"
+#include "gui/app/gui.h"
 #include "gui/interface.h"
 #include "gui/skin/skin.h"
 #include "gui/util/list.h"

Modified: trunk/gui/ui/gtk/about.c
==============================================================================
--- trunk/gui/ui/gtk/about.c	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/gui/ui/gtk/about.c	Thu Dec  6 14:47:47 2012	(r35619)
@@ -17,7 +17,7 @@
  */
 
 #include "config.h"
-#include "gui/app.h"
+#include "gui/app/app.h"
 #include "help_mp.h"
 #include "version.h"
 

Modified: trunk/gui/ui/gtk/equalizer.c
==============================================================================
--- trunk/gui/ui/gtk/equalizer.c	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/gui/ui/gtk/equalizer.c	Thu Dec  6 14:47:47 2012	(r35619)
@@ -26,8 +26,8 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include "gui/app.h"
-#include "gui/cfg.h"
+#include "gui/app/app.h"
+#include "gui/app/cfg.h"
 #include "gui/interface.h"
 #include "help_mp.h"
 #include "libaf/equalizer.h"

Modified: trunk/gui/ui/gtk/fileselect.c
==============================================================================
--- trunk/gui/ui/gtk/fileselect.c	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/gui/ui/gtk/fileselect.c	Thu Dec  6 14:47:47 2012	(r35619)
@@ -30,8 +30,8 @@
 #include "gui/ui/pixmaps/dir.xpm"
 #include "gui/ui/pixmaps/file.xpm"
 
-#include "gui/app.h"
-#include "gui/gui.h"
+#include "gui/app/app.h"
+#include "gui/app/gui.h"
 #include "gui/interface.h"
 #include "gui/util/list.h"
 #include "gui/util/mem.h"

Modified: trunk/gui/ui/gtk/menu.c
==============================================================================
--- trunk/gui/ui/gtk/menu.c	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/gui/ui/gtk/menu.c	Thu Dec  6 14:47:47 2012	(r35619)
@@ -29,8 +29,8 @@
 #include "menu.h"
 #include "gui/ui/widgets.h"
 #include "gui/ui/gmplayer.h"
-#include "gui/app.h"
-#include "gui/gui.h"
+#include "gui/app/app.h"
+#include "gui/app/gui.h"
 #include "gui/interface.h"
 
 #include "stream/stream.h"

Modified: trunk/gui/ui/gtk/msgbox.c
==============================================================================
--- trunk/gui/ui/gtk/msgbox.c	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/gui/ui/gtk/msgbox.c	Thu Dec  6 14:47:47 2012	(r35619)
@@ -18,7 +18,7 @@
 
 #include <string.h>
 
-#include "gui/app.h"
+#include "gui/app/app.h"
 #include "help_mp.h"
 
 #include "gui/ui/pixmaps/error.xpm"

Modified: trunk/gui/ui/gtk/playlist.c
==============================================================================
--- trunk/gui/ui/gtk/playlist.c	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/gui/ui/gtk/playlist.c	Thu Dec  6 14:47:47 2012	(r35619)
@@ -30,8 +30,8 @@
 #include "help_mp.h"
 #include "stream/stream.h"
 
-#include "gui/cfg.h"
-#include "gui/gui.h"
+#include "gui/app/cfg.h"
+#include "gui/app/gui.h"
 #include "gui/interface.h"
 #include "gui/ui/widgets.h"
 #include "gui/util/list.h"

Modified: trunk/gui/ui/gtk/preferences.c
==============================================================================
--- trunk/gui/ui/gtk/preferences.c	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/gui/ui/gtk/preferences.c	Thu Dec  6 14:47:47 2012	(r35619)
@@ -39,9 +39,9 @@
 #include "libmpcodecs/dec_video.h"
 #include "sub/font_load.h"
 
-#include "gui/app.h"
-#include "gui/cfg.h"
-#include "gui/gui.h"
+#include "gui/app/app.h"
+#include "gui/app/cfg.h"
+#include "gui/app/gui.h"
 #include "gui/interface.h"
 #include "gui/ui/gmplayer.h"
 #include "gui/ui/widgets.h"

Modified: trunk/gui/ui/gtk/skinbrowser.c
==============================================================================
--- trunk/gui/ui/gtk/skinbrowser.c	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/gui/ui/gtk/skinbrowser.c	Thu Dec  6 14:47:47 2012	(r35619)
@@ -26,9 +26,9 @@
 #include "skinbrowser.h"
 #include "tools.h"
 
-#include "gui/app.h"
-#include "gui/cfg.h"
-#include "gui/gui.h"
+#include "gui/app/app.h"
+#include "gui/app/cfg.h"
+#include "gui/app/gui.h"
 #include "gui/skin/skin.h"
 #include "help_mp.h"
 

Modified: trunk/gui/ui/gtk/url.c
==============================================================================
--- trunk/gui/ui/gtk/url.c	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/gui/ui/gtk/url.c	Thu Dec  6 14:47:47 2012	(r35619)
@@ -29,7 +29,7 @@
 #include "url.h"
 #include "tools.h"
 #include "gui/interface.h"
-#include "gui/app.h"
+#include "gui/app/app.h"
 #include "gui/ui/gmplayer.h"
 #include "gui/ui/widgets.h"
 #include "gui/util/list.h"

Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/gui/ui/main.c	Thu Dec  6 14:47:47 2012	(r35619)
@@ -26,8 +26,8 @@
 
 #include "config.h"
 #include "gmplayer.h"
-#include "gui/app.h"
-#include "gui/gui.h"
+#include "gui/app/app.h"
+#include "gui/app/gui.h"
 #include "gui/interface.h"
 #include "gui/skin/font.h"
 #include "gui/skin/skin.h"

Modified: trunk/gui/ui/menu.c
==============================================================================
--- trunk/gui/ui/menu.c	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/gui/ui/menu.c	Thu Dec  6 14:47:47 2012	(r35619)
@@ -25,8 +25,8 @@
 
 #include "help_mp.h"
 #include "mp_msg.h"
-#include "gui/app.h"
-#include "gui/gui.h"
+#include "gui/app/app.h"
+#include "gui/app/gui.h"
 #include "gmplayer.h"
 
 #include "widgets.h"

Modified: trunk/gui/ui/playbar.c
==============================================================================
--- trunk/gui/ui/playbar.c	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/gui/ui/playbar.c	Thu Dec  6 14:47:47 2012	(r35619)
@@ -24,8 +24,8 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "gui/app.h"
-#include "gui/gui.h"
+#include "gui/app/app.h"
+#include "gui/app/gui.h"
 #include "gui/interface.h"
 #include "gui/skin/font.h"
 #include "gui/skin/skin.h"

Modified: trunk/gui/ui/render.h
==============================================================================
--- trunk/gui/ui/render.h	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/gui/ui/render.h	Thu Dec  6 14:47:47 2012	(r35619)
@@ -19,7 +19,7 @@
 #ifndef MPLAYER_GUI_RENDER_H
 #define MPLAYER_GUI_RENDER_H
 
-#include "gui/app.h"
+#include "gui/app/app.h"
 
 void RenderAll(wsTWindow *window, wItem *Items, int nrItems, char *db);
 

Modified: trunk/gui/ui/video.c
==============================================================================
--- trunk/gui/ui/video.c	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/gui/ui/video.c	Thu Dec  6 14:47:47 2012	(r35619)
@@ -25,8 +25,8 @@
 #include "mp_core.h"
 
 #include "gmplayer.h"
-#include "gui/app.h"
-#include "gui/gui.h"
+#include "gui/app/app.h"
+#include "gui/app/gui.h"
 #include "gui/interface.h"
 #include "widgets.h"
 

Modified: trunk/gui/ui/widgets.c
==============================================================================
--- trunk/gui/ui/widgets.c	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/gui/ui/widgets.c	Thu Dec  6 14:47:47 2012	(r35619)
@@ -40,8 +40,8 @@
 #include "libvo/x11_common.h"
 
 #include "widgets.h"
-#include "gui/app.h"
-#include "gui/gui.h"
+#include "gui/app/app.h"
+#include "gui/app/gui.h"
 #include "gui/interface.h"
 #include "gui/wm/ws.h"
 

Modified: trunk/gui/util/bitmap.c
==============================================================================
--- trunk/gui/util/bitmap.c	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/gui/util/bitmap.c	Thu Dec  6 14:47:47 2012	(r35619)
@@ -27,7 +27,7 @@
 #include <unistd.h>
 
 #include "bitmap.h"
-#include "gui/gui.h"
+#include "gui/app/gui.h"
 
 #include "help_mp.h"
 #include "libavcodec/avcodec.h"

Modified: trunk/gui/util/list.c
==============================================================================
--- trunk/gui/util/list.c	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/gui/util/list.c	Thu Dec  6 14:47:47 2012	(r35619)
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #include "list.h"
-#include "gui/gui.h"
+#include "gui/app/gui.h"
 #include "string.h"
 
 #include "mp_msg.h"

Modified: trunk/gui/util/string.c
==============================================================================
--- trunk/gui/util/string.c	Thu Dec  6 03:30:19 2012	(r35618)
+++ trunk/gui/util/string.c	Thu Dec  6 14:47:47 2012	(r35619)
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #include "string.h"
-#include "gui/gui.h"
+#include "gui/app/gui.h"
 #include "gui/interface.h"
 
 #include "config.h"

More information about the MPlayer-cvslog mailing list