Make include paths consistent; do not use ../ in them.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26414 b3059339-0415-0410-9bf9-f77b7e298cf2

23 files changed, 89 insertions, 88 deletions

diff --git a/gui/interface.h b/gui/interface.h
index f3b4781ad2..42f9e46116 100644
--- a/gui/interface.h
+++ b/gui/interface.h
@@ -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 --git a/gui/mplayer/gtk/about.c b/gui/mplayer/gtk/about.c
index 8717ccbdba..e54d83ebaa 100644
--- a/gui/mplayer/gtk/about.c
+++ b/gui/mplayer/gtk/about.c
@@ -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 --git a/gui/mplayer/gtk/eq.c b/gui/mplayer/gtk/eq.c
index 2d2ee0cdcc..c9caccd4c3 100644
--- a/gui/mplayer/gtk/eq.c
+++ b/gui/mplayer/gtk/eq.c
@@ -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 --git a/gui/mplayer/gtk/fs.c b/gui/mplayer/gtk/fs.c
index da44fb3e33..c0b88e417c 100644
--- a/gui/mplayer/gtk/fs.c
+++ b/gui/mplayer/gtk/fs.c
@@ -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 --git a/gui/mplayer/gtk/gtk_url.c b/gui/mplayer/gtk/gtk_url.c
index c2d1f3fd9f..f71300aed6 100644
--- a/gui/mplayer/gtk/gtk_url.c
+++ b/gui/mplayer/gtk/gtk_url.c
@@ -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 --git a/gui/mplayer/gtk/mb.c b/gui/mplayer/gtk/mb.c
index 52092ed936..c891f5033c 100644
--- a/gui/mplayer/gtk/mb.c
+++ b/gui/mplayer/gtk/mb.c
@@ -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 --git a/gui/mplayer/gtk/menu.c b/gui/mplayer/gtk/menu.c
index 49bd511800..0698c68e6b 100644
--- a/gui/mplayer/gtk/menu.c
+++ b/gui/mplayer/gtk/menu.c
@@ -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 --git a/gui/mplayer/gtk/opts.c b/gui/mplayer/gtk/opts.c
index 32c799b520..2662d722ea 100644
--- a/gui/mplayer/gtk/opts.c
+++ b/gui/mplayer/gtk/opts.c
@@ -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 --git a/gui/mplayer/gtk/pl.c b/gui/mplayer/gtk/pl.c
index 301d6238cc..742b3c84d7 100644
--- a/gui/mplayer/gtk/pl.c
+++ b/gui/mplayer/gtk/pl.c
@@ -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 --git a/gui/mplayer/gtk/sb.c b/gui/mplayer/gtk/sb.c
index 8d48358c81..e22fd3f65a 100644
--- a/gui/mplayer/gtk/sb.c
+++ b/gui/mplayer/gtk/sb.c
@@ -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 --git a/gui/mplayer/gui_common.c b/gui/mplayer/gui_common.c
index c57fab9eeb..695605e4c0 100644
--- a/gui/mplayer/gui_common.c
+++ b/gui/mplayer/gui_common.c
@@ -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 --git a/gui/mplayer/menu.c b/gui/mplayer/menu.c
index 702ebb2351..4658a3f5f7 100644
--- a/gui/mplayer/menu.c
+++ b/gui/mplayer/menu.c
@@ -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 --git a/gui/mplayer/mw.c b/gui/mplayer/mw.c
index e4cbc9d4dd..4478649de7 100644
--- a/gui/mplayer/mw.c
+++ b/gui/mplayer/mw.c
@@ -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 "../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 "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 "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 --git a/gui/mplayer/pb.c b/gui/mplayer/pb.c
index 6ba874024e..7d1fed035f 100644
--- a/gui/mplayer/pb.c
+++ b/gui/mplayer/pb.c
@@ -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 --git a/gui/mplayer/play.c b/gui/mplayer/play.c
index 820e5de993..ccc28f50e6 100644
--- a/gui/mplayer/play.c
+++ b/gui/mplayer/play.c
@@ -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 --git a/gui/mplayer/play.h b/gui/mplayer/play.h
index 13cdc72e56..f3d5b1c3b6 100644
--- a/gui/mplayer/play.h
+++ b/gui/mplayer/play.h
@@ -1,7 +1,7 @@
 #ifndef MPLAYER_GUI_PLAY_H
 #define MPLAYER_GUI_PLAY_H
 
-#include "../config.h"
+#include "config.h"
 
 extern int mplGotoTheNext;
 
diff --git a/gui/mplayer/sw.c b/gui/mplayer/sw.c
index d4387c3472..c1ce6f3449 100644
--- a/gui/mplayer/sw.c
+++ b/gui/mplayer/sw.c
@@ -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 --git a/gui/mplayer/widgets.c b/gui/mplayer/widgets.c
index 446d36cdbd..958792afb7 100644
--- a/gui/mplayer/widgets.c
+++ b/gui/mplayer/widgets.c
@@ -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 --git a/gui/mplayer/widgets.h b/gui/mplayer/widgets.h
index 704fe274bd..9cdb13e0e3 100644
--- a/gui/mplayer/widgets.h
+++ b/gui/mplayer/widgets.h
@@ -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 --git a/gui/skin/font.c b/gui/skin/font.c
index d931e10d42..b0181962c2 100644
--- a/gui/skin/font.c
+++ b/gui/skin/font.c
@@ -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 --git a/gui/skin/skin.c b/gui/skin/skin.c
index b646c7cfa8..ac9d74f6d1 100644
--- a/gui/skin/skin.c
+++ b/gui/skin/skin.c
@@ -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 --git a/gui/wm/ws.c b/gui/wm/ws.c
index 3149354631..f7091672e0 100644
--- a/gui/wm/ws.c
+++ b/gui/wm/ws.c
@@ -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 --git a/gui/wm/wsxdnd.c b/gui/wm/wsxdnd.c
index c3029ae591..976fd66b59 100644
--- a/gui/wm/wsxdnd.c
+++ b/gui/wm/wsxdnd.c
@@ -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