# HG changeset patch
# User diego
# Date 1208016187 0
# Node ID b2f4abcf20eddb4c3a39bfa2b590cdbece903efd
# Parent  4617c374f752e0865ba34557f2369bb8e0e88caf
Make include paths consistent; do not use ../ in them.

diff -r 4617c374f752 -r b2f4abcf20ed gui/interface.h
--- a/gui/interface.h	Sat Apr 12 15:51:15 2008 +0000
+++ b/gui/interface.h	Sat Apr 12 16:03:07 2008 +0000
@@ -1,7 +1,7 @@
 #ifndef MPLAYER_GUI_INTERFACE_H
 #define MPLAYER_GUI_INTERFACE_H
 
-#include "../config.h"
+#include "config.h"
 #include "mplayer/play.h"
 #include "libvo/font_load.h"
 #include "cfg.h"
diff -r 4617c374f752 -r b2f4abcf20ed gui/mplayer/gtk/about.c
--- a/gui/mplayer/gtk/about.c	Sat Apr 12 15:51:15 2008 +0000
+++ b/gui/mplayer/gtk/about.c	Sat Apr 12 16:03:07 2008 +0000
@@ -3,7 +3,7 @@
 #include "help_mp.h"
 
 #include "gui/mplayer/pixmaps/about.xpm"
-#include "../widgets.h"
+#include "gui/mplayer/widgets.h"
 #include "about.h"
 #include "gtk_common.h"
 
diff -r 4617c374f752 -r b2f4abcf20ed gui/mplayer/gtk/eq.c
--- a/gui/mplayer/gtk/eq.c	Sat Apr 12 15:51:15 2008 +0000
+++ b/gui/mplayer/gtk/eq.c	Sat Apr 12 16:03:07 2008 +0000
@@ -19,7 +19,7 @@
 #include "libmpdemux/demuxer.h"
 #include "libmpdemux/stheader.h"
 #include "libmpcodecs/dec_video.h"
-#include "../widgets.h"
+#include "gui/mplayer/widgets.h"
 
 #include "eq.h"
 #include "gtk_common.h"
diff -r 4617c374f752 -r b2f4abcf20ed gui/mplayer/gtk/fs.c
--- a/gui/mplayer/gtk/fs.c	Sat Apr 12 15:51:15 2008 +0000
+++ b/gui/mplayer/gtk/fs.c	Sat Apr 12 16:03:07 2008 +0000
@@ -7,7 +7,7 @@
 #include <unistd.h>
 
 #include "config.h"
-#include "../gmplayer.h"
+#include "gui/mplayer/gmplayer.h"
 
 #include "gui/mplayer/pixmaps/up.xpm"
 #include "gui/mplayer/pixmaps/dir.xpm"
@@ -18,7 +18,7 @@
 #include "help_mp.h"
 #include "stream/stream.h"
 
-#include "../widgets.h"
+#include "gui/mplayer/widgets.h"
 #include "fs.h"
 #include "opts.h"
 #include "gtk_common.h"
diff -r 4617c374f752 -r b2f4abcf20ed gui/mplayer/gtk/gtk_url.c
--- a/gui/mplayer/gtk/gtk_url.c	Sat Apr 12 15:51:15 2008 +0000
+++ b/gui/mplayer/gtk/gtk_url.c	Sat Apr 12 16:03:07 2008 +0000
@@ -13,8 +13,8 @@
 #include "gtk_common.h"
 #include "gui/interface.h"
 #include "gui/app.h"
-#include "../widgets.h"
-#include "../gmplayer.h"
+#include "gui/mplayer/gmplayer.h"
+#include "gui/mplayer/widgets.h"
 #include "help_mp.h"
 
 GtkWidget * URL = NULL;
diff -r 4617c374f752 -r b2f4abcf20ed gui/mplayer/gtk/mb.c
--- a/gui/mplayer/gtk/mb.c	Sat Apr 12 15:51:15 2008 +0000
+++ b/gui/mplayer/gtk/mb.c	Sat Apr 12 16:03:07 2008 +0000
@@ -5,7 +5,7 @@
 #include "../pixmaps/error.xpm"
 #include "../pixmaps/warning.xpm"
 
-#include "../widgets.h"
+#include "gui/mplayer/widgets.h"
 #include "mb.h"
 #include "gtk_common.h"
 
diff -r 4617c374f752 -r b2f4abcf20ed gui/mplayer/gtk/menu.c
--- a/gui/mplayer/gtk/menu.c	Sat Apr 12 15:51:15 2008 +0000
+++ b/gui/mplayer/gtk/menu.c	Sat Apr 12 16:03:07 2008 +0000
@@ -9,13 +9,13 @@
 #include "mixer.h"
 
 #include "menu.h"
-#include "../widgets.h"
-#include "../gmplayer.h"
+#include "gui/mplayer/widgets.h"
+#include "gui/mplayer/gmplayer.h"
 #include "gui/app.h"
 
 #include "stream/stream.h"
-#include "../libmpdemux/demuxer.h"
-#include "../libmpdemux/stheader.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
 
 #include "../pixmaps/ab.xpm"
 #include "../pixmaps/half.xpm"
diff -r 4617c374f752 -r b2f4abcf20ed gui/mplayer/gtk/opts.c
--- a/gui/mplayer/gtk/opts.c	Sat Apr 12 15:51:15 2008 +0000
+++ b/gui/mplayer/gtk/opts.c	Sat Apr 12 16:03:07 2008 +0000
@@ -22,7 +22,7 @@
 #include "gui/app.h"
 #include "gui/cfg.h"
 #include "gui/interface.h"
-#include "../widgets.h"
+#include "gui/mplayer/widgets.h"
 #include "opts.h"
 #include "fs.h"
 #include "gtk_common.h"
diff -r 4617c374f752 -r b2f4abcf20ed gui/mplayer/gtk/pl.c
--- a/gui/mplayer/gtk/pl.c	Sat Apr 12 15:51:15 2008 +0000
+++ b/gui/mplayer/gtk/pl.c	Sat Apr 12 16:03:07 2008 +0000
@@ -15,7 +15,7 @@
 #include "stream/stream.h"
 
 #include "gui/interface.h"
-#include "../widgets.h"
+#include "gui/mplayer/widgets.h"
 #include "pl.h"
 #include "gtk_common.h"
 
diff -r 4617c374f752 -r b2f4abcf20ed gui/mplayer/gtk/sb.c
--- a/gui/mplayer/gtk/sb.c	Sat Apr 12 15:51:15 2008 +0000
+++ b/gui/mplayer/gtk/sb.c	Sat Apr 12 16:03:07 2008 +0000
@@ -13,7 +13,7 @@
 #include "gui/app.h"
 #include "help_mp.h"
 
-#include "../widgets.h"
+#include "gui/mplayer/widgets.h"
 
 GtkWidget * SkinList = NULL;
 char      * sbSelectedSkin=NULL;
diff -r 4617c374f752 -r b2f4abcf20ed gui/mplayer/gui_common.c
--- a/gui/mplayer/gui_common.c	Sat Apr 12 15:51:15 2008 +0000
+++ b/gui/mplayer/gui_common.c	Sat Apr 12 16:03:07 2008 +0000
@@ -13,19 +13,19 @@
 #include "gui/skin/skin.h"
 #include "gui/wm/ws.h"
 
-#include "../config.h"
-#include "../help_mp.h"
-#include "../libvo/x11_common.h"
+#include "config.h"
+#include "help_mp.h"
+#include "libvo/x11_common.h"
 
-#include "../stream/stream.h"
-#include "../mixer.h"
-#include "../libvo/sub.h"
+#include "stream/stream.h"
+#include "mixer.h"
+#include "libvo/sub.h"
 
-#include "../libmpdemux/demuxer.h"
-#include "../libmpdemux/stheader.h"
-#include "../codec-cfg.h"
-#include "../access_mpcontext.h"
-#include "../libavutil/avstring.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
+#include "codec-cfg.h"
+#include "access_mpcontext.h"
+#include "libavutil/avstring.h"
 
 
 #include "play.h"
diff -r 4617c374f752 -r b2f4abcf20ed gui/mplayer/menu.c
--- a/gui/mplayer/menu.c	Sat Apr 12 15:51:15 2008 +0000
+++ b/gui/mplayer/menu.c	Sat Apr 12 16:03:07 2008 +0000
@@ -3,11 +3,11 @@
 #include <stdio.h>
 #include <inttypes.h>
 
-#include "../config.h"
+#include "config.h"
+#include "help_mp.h"
+#include "mp_msg.h"
 #include "gui/app.h"
 #include "gmplayer.h"
-#include "../help_mp.h"
-#include "../mp_msg.h"
 
 #include "widgets.h"
 
diff -r 4617c374f752 -r b2f4abcf20ed gui/mplayer/mw.c
--- a/gui/mplayer/mw.c	Sat Apr 12 15:51:15 2008 +0000
+++ b/gui/mplayer/mw.c	Sat Apr 12 16:03:07 2008 +0000
@@ -8,28 +8,28 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "../config.h"
+#include "config.h"
 #include "gmplayer.h"
 #include "gui/app.h"
 #include "gui/skin/font.h"
 #include "gui/skin/skin.h"
 #include "gui/wm/ws.h"
 
-#include "../help_mp.h"
-#include "../libvo/x11_common.h"
-#include "../libvo/fastmemcpy.h"
+#include "help_mp.h"
+#include "libvo/x11_common.h"
+#include "libvo/fastmemcpy.h"
 
-#include "../stream/stream.h"
-#include "../stream/url.h"
-#include "../mixer.h"
-#include "../libvo/sub.h"
-#include "../access_mpcontext.h"
+#include "stream/stream.h"
+#include "stream/url.h"
+#include "mixer.h"
+#include "libvo/sub.h"
+#include "access_mpcontext.h"
 
-#include "../libmpdemux/demuxer.h"
-#include "../libmpdemux/stheader.h"
-#include "../codec-cfg.h"
-#include "../m_option.h"
-#include "../m_property.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
+#include "codec-cfg.h"
+#include "m_option.h"
+#include "m_property.h"
 
 #define GUI_REDRAW_WAIT 375
 
diff -r 4617c374f752 -r b2f4abcf20ed gui/mplayer/pb.c
--- a/gui/mplayer/pb.c	Sat Apr 12 15:51:15 2008 +0000
+++ b/gui/mplayer/pb.c	Sat Apr 12 16:03:07 2008 +0000
@@ -8,23 +8,23 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "../config.h"
+#include "config.h"
 #include "gui/app.h"
 #include "gui/skin/font.h"
 #include "gui/skin/skin.h"
 #include "gui/wm/ws.h"
 
-#include "../help_mp.h"
-#include "../libvo/x11_common.h"
-#include "../libvo/fastmemcpy.h"
+#include "help_mp.h"
+#include "libvo/x11_common.h"
+#include "libvo/fastmemcpy.h"
 
-#include "../stream/stream.h"
-#include "../mixer.h"
-#include "../libvo/sub.h"
+#include "stream/stream.h"
+#include "mixer.h"
+#include "libvo/sub.h"
 
-#include "../libmpdemux/demuxer.h"
-#include "../libmpdemux/stheader.h"
-#include "../codec-cfg.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
+#include "codec-cfg.h"
 
 #include "gmplayer.h"
 #include "play.h"
diff -r 4617c374f752 -r b2f4abcf20ed gui/mplayer/play.c
--- a/gui/mplayer/play.c	Sat Apr 12 15:51:15 2008 +0000
+++ b/gui/mplayer/play.c	Sat Apr 12 16:03:07 2008 +0000
@@ -7,13 +7,14 @@
 #include <unistd.h>
 #include <signal.h>
 
-#include "../config.h"
+#include "config.h"
+#include "help_mp.h"
+#include "libvo/x11_common.h"
+#include "libvo/video_out.h"
+#include "input/input.h"
+
 #include "gui/wm/ws.h"
 #include "gui/wm/wsxdnd.h"
-#include "../help_mp.h"
-#include "../libvo/x11_common.h"
-#include "../libvo/video_out.h"
-#include "../input/input.h"
 
 #include "gui/app.h"
 #include "gui/wm/wskeys.h"
diff -r 4617c374f752 -r b2f4abcf20ed gui/mplayer/play.h
--- a/gui/mplayer/play.h	Sat Apr 12 15:51:15 2008 +0000
+++ b/gui/mplayer/play.h	Sat Apr 12 16:03:07 2008 +0000
@@ -1,7 +1,7 @@
 #ifndef MPLAYER_GUI_PLAY_H
 #define MPLAYER_GUI_PLAY_H
 
-#include "../config.h"
+#include "config.h"
 
 extern int mplGotoTheNext;
 
diff -r 4617c374f752 -r b2f4abcf20ed gui/mplayer/sw.c
--- a/gui/mplayer/sw.c	Sat Apr 12 15:51:15 2008 +0000
+++ b/gui/mplayer/sw.c	Sat Apr 12 16:03:07 2008 +0000
@@ -4,13 +4,13 @@
 #include <inttypes.h>
 #include <string.h>
 
-#include "../config.h"
-#include "../libvo/x11_common.h"
+#include "config.h"
+#include "libvo/x11_common.h"
+#include "help_mp.h"
 
 #include "gmplayer.h"
 #include "gui/app.h"
 #include "gui/interface.h"
-#include "../help_mp.h"
 #include "widgets.h"
 
 int             mplSubRender = 0;
diff -r 4617c374f752 -r b2f4abcf20ed gui/mplayer/widgets.c
--- a/gui/mplayer/widgets.c	Sat Apr 12 15:51:15 2008 +0000
+++ b/gui/mplayer/widgets.c	Sat Apr 12 16:03:07 2008 +0000
@@ -15,7 +15,10 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-#include "../config.h"
+#include "config.h"
+#include "help_mp.h"
+#include "mp_msg.h"
+
 #include "widgets.h"
 #include "gui/app.h"
 #include "gui/wm/ws.h"
@@ -25,9 +28,6 @@
 #include "play.h"
 #include "gtk/fs.h"
 
-#include "../help_mp.h"
-#include "../mp_msg.h"
-
 GtkWidget     * PopUpMenu = NULL;
 
 GtkWidget     * WarningPixmap;
diff -r 4617c374f752 -r b2f4abcf20ed gui/mplayer/widgets.h
--- a/gui/mplayer/widgets.h	Sat Apr 12 15:51:15 2008 +0000
+++ b/gui/mplayer/widgets.h	Sat Apr 12 16:03:07 2008 +0000
@@ -6,8 +6,8 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include "../config.h"
-#include "../osdep/shmem.h"
+#include "config.h"
+#include "osdep/shmem.h"
 #include "play.h"
 #include "mplayer.h"
 #include "gui/interface.h"
diff -r 4617c374f752 -r b2f4abcf20ed gui/skin/font.c
--- a/gui/skin/font.c	Sat Apr 12 15:51:15 2008 +0000
+++ b/gui/skin/font.c	Sat Apr 12 16:03:07 2008 +0000
@@ -9,8 +9,8 @@
 #include "skin.h"
 #include "font.h"
 #include "cut.h"
-#include "../mp_msg.h"
-#include "../libavutil/avstring.h"
+#include "mp_msg.h"
+#include "libavutil/avstring.h"
 
 int items;
 
diff -r 4617c374f752 -r b2f4abcf20ed gui/skin/skin.c
--- a/gui/skin/skin.c	Sat Apr 12 15:51:15 2008 +0000
+++ b/gui/skin/skin.c	Sat Apr 12 16:03:07 2008 +0000
@@ -7,9 +7,9 @@
 #include "font.h"
 #include "gui/app.h"
 
-#include "../config.h"
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "config.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 #include "gui/mplayer/widgets.h"
 #include "libavutil/avstring.h"
 
diff -r 4617c374f752 -r b2f4abcf20ed gui/wm/ws.c
--- a/gui/wm/ws.c	Sat Apr 12 15:51:15 2008 +0000
+++ b/gui/wm/ws.c	Sat Apr 12 16:03:07 2008 +0000
@@ -18,19 +18,19 @@
 
 #include <inttypes.h>
 
-#include "../config.h"
-#include "../libvo/x11_common.h"
-#include "../libvo/video_out.h"
+#include "config.h"
+#include "libvo/x11_common.h"
+#include "libvo/video_out.h"
+#include "cpudetect.h"
+#include "libswscale/swscale.h"
+#include "libswscale/rgb2rgb.h"
+#include "libmpcodecs/vf_scale.h"
+#include "mp_msg.h"
+#include "help_mp.h"
+#include "mplayer.h"
+#include "mpbswap.h"
 #include "ws.h"
 #include "wsxdnd.h"
-#include "../cpudetect.h"
-#include "../libswscale/swscale.h"
-#include "../libswscale/rgb2rgb.h"
-#include "../libmpcodecs/vf_scale.h"
-#include "../mp_msg.h"
-#include "../help_mp.h"
-#include "../mplayer.h"
-#include "../mpbswap.h"
 
 #include <X11/extensions/XShm.h>
 #ifdef HAVE_XSHAPE
diff -r 4617c374f752 -r b2f4abcf20ed gui/wm/wsxdnd.c
--- a/gui/wm/wsxdnd.c	Sat Apr 12 15:51:15 2008 +0000
+++ b/gui/wm/wsxdnd.c	Sat Apr 12 16:03:07 2008 +0000
@@ -11,8 +11,8 @@
 
 #include <X11/Xatom.h>
 
-#include "../mp_msg.h"
-#include "../help_mp.h"
+#include "mp_msg.h"
+#include "help_mp.h"
 
 #define XDND_VERSION 3L