[MPlayer-cvslog] CVS: main/Gui app.c, 1.24, 1.25 bitmap.c, 1.13, 1.14 cfg.c, 1.44, 1.45 interface.c, 1.106, 1.107 interface.h, 1.39, 1.40

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/Gui
In directory mail:/var2/tmp/cvs-serv25985/Gui

Modified Files:
	app.c bitmap.c cfg.c interface.c interface.h 
Log Message:
Unify include paths, -I.. is in CFLAGS.


Index: app.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/app.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- app.c	25 Jan 2005 12:44:37 -0000	1.24
+++ app.c	8 Dec 2005 22:12:56 -0000	1.25
@@ -4,9 +4,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 
 #include "app.h"
 #include "wm/wskeys.h"

Index: bitmap.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/bitmap.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- bitmap.c	15 Dec 2004 01:22:23 -0000	1.13
+++ bitmap.c	8 Dec 2005 22:12:56 -0000	1.14
@@ -4,8 +4,8 @@
 
 #include <png.h>
 
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 #include "bitmap.h"
 
 int pngRead( unsigned char * fname,txSample * bf )

Index: cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/cfg.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- cfg.c	12 Feb 2005 16:05:10 -0000	1.44
+++ cfg.c	8 Dec 2005 22:12:56 -0000	1.45
@@ -3,15 +3,15 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../help_mp.h"
-#include "../mixer.h"
-#include "../mplayer.h"
-#include "../m_config.h"
-#include "../m_option.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "help_mp.h"
+#include "mixer.h"
+#include "mplayer.h"
+#include "m_config.h"
+#include "m_option.h"
 
-#include "../../libvo/video_out.h"
+#include "libvo/video_out.h"
 
 #include "cfg.h"
 #include "app.h"

Index: interface.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- interface.c	3 Sep 2005 15:19:52 -0000	1.106
+++ interface.c	8 Dec 2005 22:12:56 -0000	1.107
@@ -15,20 +15,20 @@
 #include "mplayer/mplayer.h"
 #include "mplayer/play.h"
 
-#include "../mplayer.h"
+#include "mplayer.h"
 #include "app.h"
 #include "cfg.h"
-#include "../help_mp.h"
-#include "../subreader.h"
-#include "../libvo/x11_common.h"
-#include "../libvo/video_out.h"
-#include "../libvo/font_load.h"
-#include "../libvo/sub.h"
-#include "../input/input.h"
-#include "../libao2/audio_out.h"
-#include "../mixer.h"
-#include "../libaf/af.h"
-#include "../libaf/equalizer.h"
+#include "help_mp.h"
+#include "subreader.h"
+#include "libvo/x11_common.h"
+#include "libvo/video_out.h"
+#include "libvo/font_load.h"
+#include "libvo/sub.h"
+#include "input/input.h"
+#include "libao2/audio_out.h"
+#include "mixer.h"
+#include "libaf/af.h"
+#include "libaf/equalizer.h"
 
 extern af_cfg_t af_cfg;
 
@@ -36,13 +36,13 @@
 #include <iconv.h>
 #endif
 
-#include "../libmpdemux/stream.h"
-#include "../libmpdemux/demuxer.h"
-#include "../libmpdemux/stheader.h"
-#include "../libmpcodecs/dec_video.h"
+#include "libmpdemux/stream.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
+#include "libmpcodecs/dec_video.h"
 
-#include "../m_config.h"
-#include "../m_option.h"
+#include "m_config.h"
+#include "m_option.h"
 
 extern mixer_t mixer; // mixer from mplayer.c
 
@@ -1195,7 +1195,7 @@
 
 #define mp_basename(s) (strrchr(s,'/')==NULL?(char*)s:(strrchr(s,'/')+1))
 
-#include "../playtree.h"
+#include "playtree.h"
 
 //This function adds/inserts one file into the gui playlist
 

Index: interface.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/interface.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- interface.h	3 Sep 2005 15:19:52 -0000	1.39
+++ interface.h	8 Dec 2005 22:12:56 -0000	1.40
@@ -2,14 +2,14 @@
 #ifndef _INTERFACE_H
 #define _INTERFACE_H
 
-#include "../config.h"
+#include "config.h"
 #include "mplayer/play.h"
-#include "../mplayer.h"
-#include "../libvo/font_load.h"
+#include "mplayer.h"
+#include "libvo/font_load.h"
 #include "cfg.h"
 
 #ifdef USE_DVDREAD
- #include "../libmpdemux/stream.h"
+ #include "libmpdemux/stream.h"
 #endif
 
 typedef struct