[MPlayer-cvslog] r25631 - in trunk/gui: Makefile mplayer/common.c mplayer/common.h mplayer/gui_common.c mplayer/gui_common.h mplayer/mw.c mplayer/pb.c

[diego]

Author: diego
Date: Sun Jan  6 17:31:26 2008
New Revision: 25631

Log:
Rename common.[ch], there are too many files by that name.


Added:
   trunk/gui/mplayer/gui_common.c
      - copied unchanged from r25628, /trunk/gui/mplayer/common.c
   trunk/gui/mplayer/gui_common.h
      - copied unchanged from r25628, /trunk/gui/mplayer/common.h
Removed:
   trunk/gui/mplayer/common.c
   trunk/gui/mplayer/common.h
Modified:
   trunk/gui/Makefile
   trunk/gui/mplayer/mw.c
   trunk/gui/mplayer/pb.c

Modified: trunk/gui/Makefile
==============================================================================
--- trunk/gui/Makefile	(original)
+++ trunk/gui/Makefile	Sun Jan  6 17:31:26 2008
@@ -20,7 +20,7 @@ SRCS_MPLAYER = app.c \
                bitmap.c \
                cfg.c \
                interface.c \
-               mplayer/common.c \
+               mplayer/gui_common.c \
                mplayer/menu.c \
                mplayer/mw.c \
                mplayer/pb.c \

Modified: trunk/gui/mplayer/mw.c
==============================================================================
--- trunk/gui/mplayer/mw.c	(original)
+++ trunk/gui/mplayer/mw.c	Sun Jan  6 17:31:26 2008
@@ -50,7 +50,7 @@ int             boxMoved = 0;
 int             sx = 0,sy = 0;
 int             i,pot = 0;
 
-#include "common.h"
+#include "gui_common.h"
 
 void mplMainDraw( void )
 {

Modified: trunk/gui/mplayer/pb.c
==============================================================================
--- trunk/gui/mplayer/pb.c	(original)
+++ trunk/gui/mplayer/pb.c	Sun Jan  6 17:31:26 2008
@@ -29,7 +29,7 @@
 #include "gmplayer.h"
 #include "play.h"
 #include "widgets.h"
-#include "common.h"
+#include "gui_common.h"
 
 extern unsigned int GetTimerMS( void );
 extern unsigned int GetTimer( void );