[MPlayer-cvslog] r21243 - in trunk/Gui: app.c interface.c mplayer/gmplayer.h mplayer/gtk/fs.c mplayer/mplayer.h mplayer/pb.c mplayer/play.c

[diego]

Author: diego
Date: Sat Nov 25 19:37:37 2006
New Revision: 21243

Added:
   trunk/Gui/mplayer/gmplayer.h
      - copied unchanged from r21242, /trunk/Gui/mplayer/mplayer.h
Removed:
   trunk/Gui/mplayer/mplayer.h
Modified:
   trunk/Gui/app.c
   trunk/Gui/interface.c
   trunk/Gui/mplayer/gtk/fs.c
   trunk/Gui/mplayer/pb.c
   trunk/Gui/mplayer/play.c

Log:
Rename Gui/mplayer/mplayer.h to gmplayer.h, another file named mplayer.h
already exists, both get included at the same time in some files...


Modified: trunk/Gui/app.c
==============================================================================
--- trunk/Gui/app.c	(original)
+++ trunk/Gui/app.c	Sat Nov 25 19:37:37 2006
@@ -11,7 +11,7 @@
 #include "app.h"
 #include "wm/wskeys.h"
 #include "skin/skin.h"
-#include "mplayer/mplayer.h"
+#include "mplayer/gmplayer.h"
 #include "interface.h"
 
 evName evNames[] =

Modified: trunk/Gui/interface.c
==============================================================================
--- trunk/Gui/interface.c	(original)
+++ trunk/Gui/interface.c	Sat Nov 25 19:37:37 2006
@@ -12,7 +12,7 @@
 
 #include "mplayer/gtk/eq.h"
 #include "mplayer/widgets.h"
-#include "mplayer/mplayer.h"
+#include "mplayer/gmplayer.h"
 #include "mplayer/play.h"
 
 #include "mplayer.h"

Modified: trunk/Gui/mplayer/gtk/fs.c
==============================================================================
--- trunk/Gui/mplayer/gtk/fs.c	(original)
+++ trunk/Gui/mplayer/gtk/fs.c	Sat Nov 25 19:37:37 2006
@@ -6,7 +6,7 @@
 #include <glob.h>
 #include <unistd.h>
 
-#include "../mplayer.h"
+#include "../gmplayer.h"
 
 #include "mplayer/pixmaps/up.xpm"
 #include "mplayer/pixmaps/dir.xpm"

Modified: trunk/Gui/mplayer/pb.c
==============================================================================
--- trunk/Gui/mplayer/pb.c	(original)
+++ trunk/Gui/mplayer/pb.c	Sat Nov 25 19:37:37 2006
@@ -20,12 +20,12 @@
 #include "../stream/stream.h"
 #include "../mixer.h"
 #include "../libvo/sub.h"
-#include "../mplayer.h"
 
 #include "../libmpdemux/demuxer.h"
 #include "../libmpdemux/stheader.h"
 #include "../codec-cfg.h"
 
+#include "gmplayer.h"
 #include "play.h"
 #include "widgets.h"
 #include "common.h"

Modified: trunk/Gui/mplayer/play.c
==============================================================================
--- trunk/Gui/mplayer/play.c	(original)
+++ trunk/Gui/mplayer/play.c	Sat Nov 25 19:37:37 2006
@@ -22,7 +22,7 @@
 #include "interface.h"
 
 #include "widgets.h"
-#include "./mplayer.h"
+#include "gmplayer.h"
 #include "play.h"
 
 #include "skin/skin.h"