[MPlayer-cvslog] r35623 - in trunk: Makefile gui/dialog/about.c gui/dialog/dialog.c gui/dialog/dialog.h gui/dialog/equalizer.c gui/dialog/fileselect.c gui/dialog/menu.c gui/dialog/msgbox.c gui/dialog/playlist.c gui...
ib
subversion at mplayerhq.hu
Thu Dec 6 16:16:39 CET 2012
Author: ib
Date: Thu Dec 6 16:16:38 2012
New Revision: 35623
Log:
Rebuild GUI directory structure.
Rename and move ui/widgets.* to dialog/dialog.*.
Added:
trunk/gui/dialog/dialog.c
- copied, changed from r35622, trunk/gui/ui/widgets.c
trunk/gui/dialog/dialog.h
- copied, changed from r35622, trunk/gui/ui/widgets.h
Deleted:
trunk/gui/ui/widgets.c
trunk/gui/ui/widgets.h
Modified:
trunk/Makefile
trunk/gui/dialog/about.c
trunk/gui/dialog/equalizer.c
trunk/gui/dialog/fileselect.c
trunk/gui/dialog/menu.c
trunk/gui/dialog/msgbox.c
trunk/gui/dialog/playlist.c
trunk/gui/dialog/preferences.c
trunk/gui/dialog/skinbrowser.c
trunk/gui/dialog/url.c
trunk/gui/interface.c
trunk/gui/skin/skin.c
trunk/gui/ui/main.c
trunk/gui/ui/menu.c
trunk/gui/ui/playbar.c
trunk/gui/ui/video.c
trunk/gui/wm/ws.h
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Thu Dec 6 15:59:06 2012 (r35622)
+++ trunk/Makefile Thu Dec 6 16:16:38 2012 (r35623)
@@ -500,6 +500,7 @@ SRCS_MPLAYER-$(GUI) += gui/util
SRCS_MPLAYER-$(GUI_GTK) += gui/app/app.c \
gui/app/cfg.c \
gui/dialog/about.c \
+ gui/dialog/dialog.c \
gui/dialog/equalizer.c \
gui/dialog/fileselect.c \
gui/dialog/menu.c \
@@ -518,7 +519,6 @@ SRCS_MPLAYER-$(GUI_GTK) += gui/app/
gui/ui/playbar.c \
gui/ui/render.c \
gui/ui/video.c \
- gui/ui/widgets.c \
gui/util/cut.c \
gui/wm/ws.c \
gui/wm/wsxdnd.c \
Modified: trunk/gui/dialog/about.c
==============================================================================
--- trunk/gui/dialog/about.c Thu Dec 6 15:59:06 2012 (r35622)
+++ trunk/gui/dialog/about.c Thu Dec 6 16:16:38 2012 (r35623)
@@ -22,7 +22,7 @@
#include "version.h"
#include "pixmaps/emblem.xpm"
-#include "gui/ui/widgets.h"
+#include "dialog.h"
#include "about.h"
#include "tools.h"
Copied and modified: trunk/gui/dialog/dialog.c (from r35622, trunk/gui/ui/widgets.c)
==============================================================================
--- trunk/gui/ui/widgets.c Thu Dec 6 15:59:06 2012 (r35622, copy source)
+++ trunk/gui/dialog/dialog.c Thu Dec 6 16:16:38 2012 (r35623)
@@ -39,14 +39,14 @@
#include "libavutil/intreadwrite.h"
#include "libvo/x11_common.h"
-#include "widgets.h"
+#include "dialog.h"
#include "gui/app/app.h"
#include "gui/app/gui.h"
#include "gui/interface.h"
#include "gui/wm/ws.h"
-#include "actions.h"
-#include "gui/dialog/fileselect.h"
+#include "gui/ui/actions.h"
+#include "fileselect.h"
GtkWidget *PopUpMenu = NULL;
@@ -57,14 +57,14 @@ int gtkPopupMenu = 0;
int gtkPopupMenuParam = 0;
int gtkInitialized = False;
-#include "gui/dialog/skinbrowser.h"
-#include "gui/dialog/playlist.h"
-#include "gui/dialog/msgbox.h"
-#include "gui/dialog/about.h"
-#include "gui/dialog/preferences.h"
-#include "gui/dialog/menu.h"
-#include "gui/dialog/url.h"
-#include "gui/dialog/equalizer.h"
+#include "skinbrowser.h"
+#include "playlist.h"
+#include "msgbox.h"
+#include "about.h"
+#include "preferences.h"
+#include "menu.h"
+#include "url.h"
+#include "equalizer.h"
static const char gui_icon_name[] = "mplayer";
Copied and modified: trunk/gui/dialog/dialog.h (from r35622, trunk/gui/ui/widgets.h)
==============================================================================
--- trunk/gui/ui/widgets.h Thu Dec 6 15:59:06 2012 (r35622, copy source)
+++ trunk/gui/dialog/dialog.h Thu Dec 6 16:16:38 2012 (r35623)
@@ -16,8 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MPLAYER_GUI_WIDGETS_H
-#define MPLAYER_GUI_WIDGETS_H
+#ifndef MPLAYER_GUI_DIALOG_H
+#define MPLAYER_GUI_DIALOG_H
#include <stdio.h>
#include <stdlib.h>
@@ -27,7 +27,7 @@
#include <X11/Xproto.h>
#include "osdep/shmem.h"
-#include "actions.h"
+#include "gui/ui/actions.h"
#include "mplayer.h"
#define GTK_MB_SIMPLE 0
@@ -80,4 +80,4 @@ void gtkMessageBox(int type, const gchar
void gtkSetLayer(GtkWidget *wdg);
void gtkActive(GtkWidget *wdg);
-#endif /* MPLAYER_GUI_WIDGETS_H */
+#endif /* MPLAYER_GUI_DIALOG_H */
Modified: trunk/gui/dialog/equalizer.c
==============================================================================
--- trunk/gui/dialog/equalizer.c Thu Dec 6 15:59:06 2012 (r35622)
+++ trunk/gui/dialog/equalizer.c Thu Dec 6 16:16:38 2012 (r35623)
@@ -37,7 +37,7 @@
#include "libmpdemux/demuxer.h"
#include "libmpdemux/stheader.h"
#include "libmpcodecs/dec_video.h"
-#include "gui/ui/widgets.h"
+#include "dialog.h"
#include "gui/util/mem.h"
#include "gui/util/string.h"
Modified: trunk/gui/dialog/fileselect.c
==============================================================================
--- trunk/gui/dialog/fileselect.c Thu Dec 6 15:59:06 2012 (r35622)
+++ trunk/gui/dialog/fileselect.c Thu Dec 6 16:16:38 2012 (r35623)
@@ -41,7 +41,7 @@
#include "stream/stream.h"
#include "libavutil/common.h"
-#include "gui/ui/widgets.h"
+#include "dialog.h"
#include "fileselect.h"
#include "preferences.h"
#include "tools.h"
Modified: trunk/gui/dialog/menu.c
==============================================================================
--- trunk/gui/dialog/menu.c Thu Dec 6 15:59:06 2012 (r35622)
+++ trunk/gui/dialog/menu.c Thu Dec 6 16:16:38 2012 (r35623)
@@ -27,7 +27,7 @@
#include "mpcommon.h"
#include "menu.h"
-#include "gui/ui/widgets.h"
+#include "dialog.h"
#include "gui/ui/ui.h"
#include "gui/app/app.h"
#include "gui/app/gui.h"
Modified: trunk/gui/dialog/msgbox.c
==============================================================================
--- trunk/gui/dialog/msgbox.c Thu Dec 6 15:59:06 2012 (r35622)
+++ trunk/gui/dialog/msgbox.c Thu Dec 6 16:16:38 2012 (r35623)
@@ -24,7 +24,7 @@
#include "pixmaps/error.xpm"
#include "pixmaps/warning.xpm"
-#include "gui/ui/widgets.h"
+#include "dialog.h"
#include "msgbox.h"
#include "tools.h"
Modified: trunk/gui/dialog/playlist.c
==============================================================================
--- trunk/gui/dialog/playlist.c Thu Dec 6 15:59:06 2012 (r35622)
+++ trunk/gui/dialog/playlist.c Thu Dec 6 16:16:38 2012 (r35623)
@@ -33,7 +33,7 @@
#include "gui/app/cfg.h"
#include "gui/app/gui.h"
#include "gui/interface.h"
-#include "gui/ui/widgets.h"
+#include "dialog.h"
#include "gui/util/list.h"
#include "gui/util/mem.h"
#include "gui/util/string.h"
Modified: trunk/gui/dialog/preferences.c
==============================================================================
--- trunk/gui/dialog/preferences.c Thu Dec 6 15:59:06 2012 (r35622)
+++ trunk/gui/dialog/preferences.c Thu Dec 6 16:16:38 2012 (r35623)
@@ -44,7 +44,7 @@
#include "gui/app/gui.h"
#include "gui/interface.h"
#include "gui/ui/ui.h"
-#include "gui/ui/widgets.h"
+#include "dialog.h"
#include "gui/util/list.h"
#include "gui/util/mem.h"
#include "gui/util/string.h"
Modified: trunk/gui/dialog/skinbrowser.c
==============================================================================
--- trunk/gui/dialog/skinbrowser.c Thu Dec 6 15:59:06 2012 (r35622)
+++ trunk/gui/dialog/skinbrowser.c Thu Dec 6 16:16:38 2012 (r35623)
@@ -32,7 +32,7 @@
#include "gui/skin/skin.h"
#include "help_mp.h"
-#include "gui/ui/widgets.h"
+#include "dialog.h"
GtkWidget * SkinList = NULL;
char * sbSelectedSkin=NULL;
Modified: trunk/gui/dialog/url.c
==============================================================================
--- trunk/gui/dialog/url.c Thu Dec 6 15:59:06 2012 (r35622)
+++ trunk/gui/dialog/url.c Thu Dec 6 16:16:38 2012 (r35623)
@@ -31,7 +31,7 @@
#include "gui/interface.h"
#include "gui/app/app.h"
#include "gui/ui/ui.h"
-#include "gui/ui/widgets.h"
+#include "dialog.h"
#include "gui/util/list.h"
#include "gui/util/string.h"
#include "help_mp.h"
Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c Thu Dec 6 15:59:06 2012 (r35622)
+++ trunk/gui/interface.c Thu Dec 6 16:16:38 2012 (r35623)
@@ -24,9 +24,9 @@
#include "interface.h"
#include "app/app.h"
#include "app/gui.h"
+#include "dialog/dialog.h"
#include "skin/skin.h"
#include "ui/ui.h"
-#include "ui/widgets.h"
#include "util/list.h"
#include "util/mem.h"
#include "util/string.h"
Modified: trunk/gui/skin/skin.c
==============================================================================
--- trunk/gui/skin/skin.c Thu Dec 6 15:59:06 2012 (r35622)
+++ trunk/gui/skin/skin.c Thu Dec 6 16:16:38 2012 (r35623)
@@ -28,8 +28,8 @@
#include "font.h"
#include "gui/app/app.h"
#include "gui/app/gui.h"
+#include "gui/dialog/dialog.h"
#include "gui/interface.h"
-#include "gui/ui/widgets.h"
#include "gui/util/cut.h"
#include "gui/util/string.h"
Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c Thu Dec 6 15:59:06 2012 (r35622)
+++ trunk/gui/ui/main.c Thu Dec 6 16:16:38 2012 (r35623)
@@ -60,7 +60,7 @@
#define GUI_REDRAW_WAIT 375
#include "actions.h"
-#include "widgets.h"
+#include "gui/dialog/dialog.h"
unsigned int GetTimerMS( void );
Modified: trunk/gui/ui/menu.c
==============================================================================
--- trunk/gui/ui/menu.c Thu Dec 6 15:59:06 2012 (r35622)
+++ trunk/gui/ui/menu.c Thu Dec 6 16:16:38 2012 (r35623)
@@ -29,7 +29,7 @@
#include "gui/app/gui.h"
#include "ui.h"
-#include "widgets.h"
+#include "gui/dialog/dialog.h"
unsigned char * menuDrawBuffer = NULL;
int menuRender = True;
Modified: trunk/gui/ui/playbar.c
==============================================================================
--- trunk/gui/ui/playbar.c Thu Dec 6 15:59:06 2012 (r35622)
+++ trunk/gui/ui/playbar.c Thu Dec 6 16:16:38 2012 (r35623)
@@ -47,7 +47,7 @@
#include "ui.h"
#include "actions.h"
-#include "widgets.h"
+#include "gui/dialog/dialog.h"
#include "render.h"
unsigned int GetTimerMS( void );
Modified: trunk/gui/ui/video.c
==============================================================================
--- trunk/gui/ui/video.c Thu Dec 6 15:59:06 2012 (r35622)
+++ trunk/gui/ui/video.c Thu Dec 6 16:16:38 2012 (r35623)
@@ -28,7 +28,7 @@
#include "gui/app/app.h"
#include "gui/app/gui.h"
#include "gui/interface.h"
-#include "widgets.h"
+#include "gui/dialog/dialog.h"
int uiVideoRender = False;
int videoVisible = 0;
Modified: trunk/gui/wm/ws.h
==============================================================================
--- trunk/gui/wm/ws.h Thu Dec 6 15:59:06 2012 (r35622)
+++ trunk/gui/wm/ws.h Thu Dec 6 16:16:38 2012 (r35623)
@@ -22,7 +22,7 @@
#ifndef MPLAYER_GUI_WS_H
#define MPLAYER_GUI_WS_H
-#include "gui/ui/widgets.h"
+#include "gui/dialog/dialog.h"
#include "config.h"
#include <X11/Xlib.h>
More information about the MPlayer-cvslog
mailing list