[MPlayer-cvslog] r33644 - in trunk: Makefile gui/interface.c gui/interface.h gui/mplayer gui/skin/skin.c gui/ui gui/ui/actions.c gui/ui/actions.h gui/ui/gui_common.c gui/ui/gui_common.h gui/ui/main.c gui/ui/mw.c gu...
ib
subversion at mplayerhq.hu
Sat Jun 18 18:03:32 CEST 2011
Author: ib
Date: Sat Jun 18 18:03:31 2011
New Revision: 33644
Log:
Rename GUI directory 'mplayer' and some files in it.
The directory 'mplayer' contains the files for the user interface and
has thus been renamed 'ui'.
Inside this directory the following files have been renamed to better
reflect their contents:
mw.c -> main.c
sw.c -> sub.c
pb.c -> playbar.c
gui_common.* -> render.*
play.* -> actions.*
Added:
trunk/gui/ui/
- copied from r33643, trunk/gui/mplayer/
trunk/gui/ui/actions.c
- copied, changed from r33643, trunk/gui/mplayer/play.c
trunk/gui/ui/actions.h
- copied unchanged from r33643, trunk/gui/mplayer/play.h
trunk/gui/ui/main.c
- copied, changed from r33643, trunk/gui/mplayer/mw.c
trunk/gui/ui/playbar.c
- copied, changed from r33643, trunk/gui/mplayer/pb.c
trunk/gui/ui/render.c
- copied, changed from r33643, trunk/gui/mplayer/gui_common.c
trunk/gui/ui/render.h
- copied, changed from r33643, trunk/gui/mplayer/gui_common.h
trunk/gui/ui/sub.c
- copied unchanged from r33643, trunk/gui/mplayer/sw.c
Deleted:
trunk/gui/mplayer/
trunk/gui/ui/gui_common.c
trunk/gui/ui/gui_common.h
trunk/gui/ui/mw.c
trunk/gui/ui/pb.c
trunk/gui/ui/play.c
trunk/gui/ui/play.h
trunk/gui/ui/sw.c
Modified:
trunk/Makefile
trunk/gui/interface.c
trunk/gui/interface.h
trunk/gui/skin/skin.c
trunk/gui/ui/widgets.c
trunk/gui/ui/widgets.h
trunk/gui/wm/ws.h
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Sat Jun 18 16:33:41 2011 (r33643)
+++ trunk/Makefile Sat Jun 18 18:03:31 2011 (r33644)
@@ -521,25 +521,25 @@ SRCS_MPLAYER-$(GUI) += gui/util
SRCS_MPLAYER-$(GUI_GTK) += gui/app.c \
gui/cfg.c \
gui/interface.c \
- gui/mplayer/gui_common.c \
- gui/mplayer/menu.c \
- gui/mplayer/mw.c \
- gui/mplayer/pb.c \
- gui/mplayer/play.c \
- gui/mplayer/sw.c \
- gui/mplayer/widgets.c \
- gui/mplayer/gtk/about.c \
- gui/mplayer/gtk/eq.c \
- gui/mplayer/gtk/fs.c \
- gui/mplayer/gtk/gtk_common.c \
- gui/mplayer/gtk/gtk_menu.c \
- gui/mplayer/gtk/gtk_url.c \
- gui/mplayer/gtk/mb.c \
- gui/mplayer/gtk/opts.c \
- gui/mplayer/gtk/pl.c \
- gui/mplayer/gtk/sb.c \
gui/skin/font.c \
gui/skin/skin.c \
+ gui/ui/actions.c \
+ gui/ui/gtk/about.c \
+ gui/ui/gtk/eq.c \
+ gui/ui/gtk/fs.c \
+ gui/ui/gtk/gtk_common.c \
+ gui/ui/gtk/gtk_menu.c \
+ gui/ui/gtk/gtk_url.c \
+ gui/ui/gtk/mb.c \
+ gui/ui/gtk/opts.c \
+ gui/ui/gtk/pl.c \
+ gui/ui/gtk/sb.c \
+ gui/ui/main.c \
+ gui/ui/menu.c \
+ gui/ui/playbar.c \
+ gui/ui/render.c \
+ gui/ui/sub.c \
+ gui/ui/widgets.c \
gui/util/cut.c \
gui/util/string.c \
gui/wm/ws.c \
@@ -735,11 +735,11 @@ DIRS = . \
ffmpeg/libswscale/sparc \
ffmpeg/libswscale/x86 \
gui \
- gui/mplayer \
- gui/mplayer/gtk \
gui/skin \
- gui/wm \
+ gui/ui \
+ gui/ui/gtk \
gui/win32 \
+ gui/wm \
input \
libaf \
libao2 \
Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c Sat Jun 18 16:33:41 2011 (r33643)
+++ trunk/gui/interface.c Sat Jun 18 18:03:31 2011 (r33644)
@@ -21,9 +21,9 @@
#include "interface.h"
#include "app.h"
-#include "mplayer/gmplayer.h"
-#include "mplayer/widgets.h"
#include "skin/skin.h"
+#include "ui/gmplayer.h"
+#include "ui/widgets.h"
#include "wm/ws.h"
#include "wm/wsxdnd.h"
Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h Sat Jun 18 16:33:41 2011 (r33643)
+++ trunk/gui/interface.h Sat Jun 18 18:03:31 2011 (r33644)
@@ -29,7 +29,7 @@
// the GUI and that only need to include interface.h for this.
// ------------------------------------------------------------
#include "cfg.h"
-#include "mplayer/play.h"
+#include "ui/actions.h"
extern int use_gui; // this is defined in mplayer.c
// ------------------------------------------------------------
Modified: trunk/gui/skin/skin.c
==============================================================================
--- trunk/gui/skin/skin.c Sat Jun 18 16:33:41 2011 (r33643)
+++ trunk/gui/skin/skin.c Sat Jun 18 18:03:31 2011 (r33644)
@@ -23,7 +23,7 @@
#include "font.h"
#include "gui/app.h"
#include "gui/interface.h"
-#include "gui/mplayer/widgets.h"
+#include "gui/ui/widgets.h"
#include "gui/util/cut.h"
#include "gui/util/string.h"
Copied and modified: trunk/gui/ui/actions.c (from r33643, trunk/gui/mplayer/play.c)
==============================================================================
--- trunk/gui/mplayer/play.c Sat Jun 18 16:33:41 2011 (r33643, copy source)
+++ trunk/gui/ui/actions.c Sat Jun 18 18:03:31 2011 (r33644)
@@ -19,7 +19,7 @@
#include <stdlib.h>
#include <string.h>
-#include "play.h"
+#include "actions.h"
#include "gmplayer.h"
#include "gui/app.h"
#include "gui/interface.h"
Copied and modified: trunk/gui/ui/main.c (from r33643, trunk/gui/mplayer/mw.c)
==============================================================================
--- trunk/gui/mplayer/mw.c Sat Jun 18 16:33:41 2011 (r33643, copy source)
+++ trunk/gui/ui/main.c Sat Jun 18 18:03:31 2011 (r33644)
@@ -53,7 +53,7 @@
#define GUI_REDRAW_WAIT 375
-#include "play.h"
+#include "actions.h"
#include "widgets.h"
unsigned int GetTimerMS( void );
@@ -70,7 +70,7 @@ int boxMoved = 0;
int sx = 0,sy = 0;
int i,pot = 0;
-#include "gui_common.h"
+#include "render.h"
void uiMainDraw( void )
{
Copied and modified: trunk/gui/ui/playbar.c (from r33643, trunk/gui/mplayer/pb.c)
==============================================================================
--- trunk/gui/mplayer/pb.c Sat Jun 18 16:33:41 2011 (r33643, copy source)
+++ trunk/gui/ui/playbar.c Sat Jun 18 18:03:31 2011 (r33644)
@@ -44,9 +44,9 @@
#include "codec-cfg.h"
#include "gmplayer.h"
-#include "play.h"
+#include "actions.h"
#include "widgets.h"
-#include "gui_common.h"
+#include "render.h"
unsigned int GetTimerMS( void );
unsigned int GetTimer( void );
Copied and modified: trunk/gui/ui/render.c (from r33643, trunk/gui/mplayer/gui_common.c)
==============================================================================
--- trunk/gui/mplayer/gui_common.c Sat Jun 18 16:33:41 2011 (r33643, copy source)
+++ trunk/gui/ui/render.c Sat Jun 18 18:03:31 2011 (r33644)
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <string.h>
-#include "gui_common.h"
+#include "render.h"
#include "gui/interface.h"
#include "gui/skin/font.h"
Copied and modified: trunk/gui/ui/render.h (from r33643, trunk/gui/mplayer/gui_common.h)
==============================================================================
--- trunk/gui/mplayer/gui_common.h Sat Jun 18 16:33:41 2011 (r33643, copy source)
+++ trunk/gui/ui/render.h Sat Jun 18 18:03:31 2011 (r33644)
@@ -16,11 +16,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MPLAYER_GUI_GUI_COMMON_H
-#define MPLAYER_GUI_GUI_COMMON_H
+#ifndef MPLAYER_GUI_RENDER_H
+#define MPLAYER_GUI_RENDER_H
#include "gui/app.h"
void RenderAll(wsTWindow *window, wItem *Items, int nrItems, char *db);
-#endif /* MPLAYER_GUI_GUI_COMMON_H */
+#endif /* MPLAYER_GUI_RENDER_H */
Modified: trunk/gui/ui/widgets.c
==============================================================================
--- trunk/gui/mplayer/widgets.c Sat Jun 18 16:33:41 2011 (r33643)
+++ trunk/gui/ui/widgets.c Sat Jun 18 18:03:31 2011 (r33644)
@@ -43,7 +43,7 @@
#include "gui/interface.h"
#include "gui/wm/ws.h"
-#include "play.h"
+#include "actions.h"
#include "gtk/fs.h"
GtkWidget *PopUpMenu = NULL;
Modified: trunk/gui/ui/widgets.h
==============================================================================
--- trunk/gui/mplayer/widgets.h Sat Jun 18 16:33:41 2011 (r33643)
+++ trunk/gui/ui/widgets.h Sat Jun 18 18:03:31 2011 (r33644)
@@ -28,7 +28,7 @@
#include "config.h"
#include "osdep/shmem.h"
-#include "play.h"
+#include "actions.h"
#include "mplayer.h"
#include "gui/interface.h"
Modified: trunk/gui/wm/ws.h
==============================================================================
--- trunk/gui/wm/ws.h Sat Jun 18 16:33:41 2011 (r33643)
+++ trunk/gui/wm/ws.h Sat Jun 18 18:03:31 2011 (r33644)
@@ -22,7 +22,7 @@
#ifndef MPLAYER_GUI_WS_H
#define MPLAYER_GUI_WS_H
-#include "gui/mplayer/widgets.h"
+#include "gui/ui/widgets.h"
#include <X11/Xlib.h>
#include <X11/Xutil.h>
More information about the MPlayer-cvslog
mailing list