# HG changeset patch
# User diego
# Date 1164479857 0
# Node ID 308495b6d611a3863305c8a818fb3acdc3475e0d
# Parent  8a7bcdba8e19fd8658144ad78816ca5eb528a8e2
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...

diff -r 8a7bcdba8e19 -r 308495b6d611 Gui/app.c
--- a/Gui/app.c	Sat Nov 25 18:30:44 2006 +0000
+++ b/Gui/app.c	Sat Nov 25 18:37:37 2006 +0000
@@ -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[] =
diff -r 8a7bcdba8e19 -r 308495b6d611 Gui/interface.c
--- a/Gui/interface.c	Sat Nov 25 18:30:44 2006 +0000
+++ b/Gui/interface.c	Sat Nov 25 18:37:37 2006 +0000
@@ -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"
diff -r 8a7bcdba8e19 -r 308495b6d611 Gui/mplayer/gmplayer.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Gui/mplayer/gmplayer.h	Sat Nov 25 18:37:37 2006 +0000
@@ -0,0 +1,35 @@
+
+#ifndef __MYMPLAYERHANDLER
+#define __MYMPLAYERHANDLER
+
+extern int             mplSubRender;
+extern int             mplMainRender;
+
+extern unsigned char * mplDrawBuffer;
+extern unsigned char * mplMenuDrawBuffer;
+extern int             mainVisible;
+
+extern int             mplMainAutoPlay;
+extern int             mplMiddleMenu;
+
+extern void mplInit( void * disp );
+extern void mplEventHandling( int msg,float param );
+
+extern void mplMainDraw( void );
+extern void mplEventHandling( int msg,float param );
+extern void mplMainMouseHandle( int Button,int X,int Y,int RX,int RY );
+extern void mplMainKeyHandle( int KeyCode,int Type,int Key );
+extern void mplDandDHandler(int num,char** files);
+
+extern void mplSubDraw( void );
+extern void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY );
+
+extern void mplMenuInit( void );
+extern void mplHideMenu( int mx,int my,int w );
+extern void mplShowMenu( int mx,int my );
+extern void mplMenuMouseHandle( int X,int Y,int RX,int RY );
+
+extern void mplPBInit( void );
+extern void mplPBShow( int x, int y );
+
+#endif
diff -r 8a7bcdba8e19 -r 308495b6d611 Gui/mplayer/gtk/fs.c
--- a/Gui/mplayer/gtk/fs.c	Sat Nov 25 18:30:44 2006 +0000
+++ b/Gui/mplayer/gtk/fs.c	Sat Nov 25 18:37:37 2006 +0000
@@ -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"
diff -r 8a7bcdba8e19 -r 308495b6d611 Gui/mplayer/mplayer.h
--- a/Gui/mplayer/mplayer.h	Sat Nov 25 18:30:44 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-
-#ifndef __MYMPLAYERHANDLER
-#define __MYMPLAYERHANDLER
-
-extern int             mplSubRender;
-extern int             mplMainRender;
-
-extern unsigned char * mplDrawBuffer;
-extern unsigned char * mplMenuDrawBuffer;
-extern int             mainVisible;
-
-extern int             mplMainAutoPlay;
-extern int             mplMiddleMenu;
-
-extern void mplInit( void * disp );
-extern void mplEventHandling( int msg,float param );
-
-extern void mplMainDraw( void );
-extern void mplEventHandling( int msg,float param );
-extern void mplMainMouseHandle( int Button,int X,int Y,int RX,int RY );
-extern void mplMainKeyHandle( int KeyCode,int Type,int Key );
-extern void mplDandDHandler(int num,char** files);
-
-extern void mplSubDraw( void );
-extern void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY );
-
-extern void mplMenuInit( void );
-extern void mplHideMenu( int mx,int my,int w );
-extern void mplShowMenu( int mx,int my );
-extern void mplMenuMouseHandle( int X,int Y,int RX,int RY );
-
-extern void mplPBInit( void );
-extern void mplPBShow( int x, int y );
-
-#endif
diff -r 8a7bcdba8e19 -r 308495b6d611 Gui/mplayer/pb.c
--- a/Gui/mplayer/pb.c	Sat Nov 25 18:30:44 2006 +0000
+++ b/Gui/mplayer/pb.c	Sat Nov 25 18:37:37 2006 +0000
@@ -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"
diff -r 8a7bcdba8e19 -r 308495b6d611 Gui/mplayer/play.c
--- a/Gui/mplayer/play.c	Sat Nov 25 18:30:44 2006 +0000
+++ b/Gui/mplayer/play.c	Sat Nov 25 18:37:37 2006 +0000
@@ -22,7 +22,7 @@
 #include "interface.h"
 
 #include "widgets.h"
-#include "./mplayer.h"
+#include "gmplayer.h"
 #include "play.h"
 
 #include "skin/skin.h"