Add gui/ prefix to some #include paths so that compilation from the

top-level source directory does not fail.


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

22 files changed, 53 insertions, 54 deletions

diff --git a/gui/mplayer/gtk/about.c b/gui/mplayer/gtk/about.c
index 5ae73d806a..8717ccbdba 100644
--- a/gui/mplayer/gtk/about.c
+++ b/gui/mplayer/gtk/about.c
@@ -1,8 +1,8 @@
 #include "config.h"
-#include "app.h"
+#include "gui/app.h"
 #include "help_mp.h"
 
-#include "mplayer/pixmaps/about.xpm"
+#include "gui/mplayer/pixmaps/about.xpm"
 #include "../widgets.h"
 #include "about.h"
 #include "gtk_common.h"
diff --git a/gui/mplayer/gtk/eq.c b/gui/mplayer/gtk/eq.c
index 48279534d8..2d2ee0cdcc 100644
--- a/gui/mplayer/gtk/eq.c
+++ b/gui/mplayer/gtk/eq.c
@@ -10,8 +10,8 @@
 #include <gtk/gtk.h>
 
 #include "config.h"
-#include "app.h"
-#include "cfg.h"
+#include "gui/app.h"
+#include "gui/cfg.h"
 #include "help_mp.h"
 #include "libaf/equalizer.h"
 #include "libvo/video_out.h"
diff --git a/gui/mplayer/gtk/fs.c b/gui/mplayer/gtk/fs.c
index 0cbffbe46a..da44fb3e33 100644
--- a/gui/mplayer/gtk/fs.c
+++ b/gui/mplayer/gtk/fs.c
@@ -9,12 +9,12 @@
 #include "config.h"
 #include "../gmplayer.h"
 
-#include "mplayer/pixmaps/up.xpm"
-#include "mplayer/pixmaps/dir.xpm"
-#include "mplayer/pixmaps/file.xpm"
+#include "gui/mplayer/pixmaps/up.xpm"
+#include "gui/mplayer/pixmaps/dir.xpm"
+#include "gui/mplayer/pixmaps/file.xpm"
 
-#include "app.h"
-#include "interface.h"
+#include "gui/app.h"
+#include "gui/interface.h"
 #include "help_mp.h"
 #include "stream/stream.h"
 
diff --git a/gui/mplayer/gtk/gtk_url.c b/gui/mplayer/gtk/gtk_url.c
index 1ce9a315e8..c2d1f3fd9f 100644
--- a/gui/mplayer/gtk/gtk_url.c
+++ b/gui/mplayer/gtk/gtk_url.c
@@ -11,8 +11,8 @@
 
 #include "gtk_url.h"
 #include "gtk_common.h"
-#include "interface.h"
-#include "app.h"
+#include "gui/interface.h"
+#include "gui/app.h"
 #include "../widgets.h"
 #include "../gmplayer.h"
 #include "help_mp.h"
diff --git a/gui/mplayer/gtk/mb.c b/gui/mplayer/gtk/mb.c
index 3938830ea8..52092ed936 100644
--- a/gui/mplayer/gtk/mb.c
+++ b/gui/mplayer/gtk/mb.c
@@ -1,5 +1,5 @@
 #include "config.h"
-#include "app.h"
+#include "gui/app.h"
 #include "help_mp.h"
 
 #include "../pixmaps/error.xpm"
diff --git a/gui/mplayer/gtk/menu.c b/gui/mplayer/gtk/menu.c
index 2a75dbd7e8..49bd511800 100644
--- a/gui/mplayer/gtk/menu.c
+++ b/gui/mplayer/gtk/menu.c
@@ -11,7 +11,7 @@
 #include "menu.h"
 #include "../widgets.h"
 #include "../gmplayer.h"
-#include "app.h"
+#include "gui/app.h"
 
 #include "stream/stream.h"
 #include "../libmpdemux/demuxer.h"
diff --git a/gui/mplayer/gtk/opts.c b/gui/mplayer/gtk/opts.c
index 722c09ff31..32c799b520 100644
--- a/gui/mplayer/gtk/opts.c
+++ b/gui/mplayer/gtk/opts.c
@@ -19,9 +19,9 @@
 #include "libmpdemux/stheader.h"
 #include "libmpcodecs/dec_video.h"
 
-#include "app.h"
-#include "cfg.h"
-#include "interface.h"
+#include "gui/app.h"
+#include "gui/cfg.h"
+#include "gui/interface.h"
 #include "../widgets.h"
 #include "opts.h"
 #include "fs.h"
diff --git a/gui/mplayer/gtk/pl.c b/gui/mplayer/gtk/pl.c
index 1e5b81eb6f..301d6238cc 100644
--- a/gui/mplayer/gtk/pl.c
+++ b/gui/mplayer/gtk/pl.c
@@ -14,7 +14,7 @@
 #include "help_mp.h"
 #include "stream/stream.h"
 
-#include "interface.h"
+#include "gui/interface.h"
 #include "../widgets.h"
 #include "pl.h"
 #include "gtk_common.h"
diff --git a/gui/mplayer/gtk/sb.c b/gui/mplayer/gtk/sb.c
index ae63aa4707..8d48358c81 100644
--- a/gui/mplayer/gtk/sb.c
+++ b/gui/mplayer/gtk/sb.c
@@ -10,7 +10,7 @@
 #include "sb.h"
 #include "gtk_common.h"
 
-#include "app.h"
+#include "gui/app.h"
 #include "help_mp.h"
 
 #include "../widgets.h"
diff --git a/gui/mplayer/gui_common.c b/gui/mplayer/gui_common.c
index 1cdf9b0cd2..c57fab9eeb 100644
--- a/gui/mplayer/gui_common.c
+++ b/gui/mplayer/gui_common.c
@@ -8,10 +8,10 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "app.h"
-#include "skin/font.h"
-#include "skin/skin.h"
-#include "wm/ws.h"
+#include "gui/app.h"
+#include "gui/skin/font.h"
+#include "gui/skin/skin.h"
+#include "gui/wm/ws.h"
 
 #include "../config.h"
 #include "../help_mp.h"
diff --git a/gui/mplayer/gui_common.h b/gui/mplayer/gui_common.h
index 441b3455dc..42a3731211 100644
--- a/gui/mplayer/gui_common.h
+++ b/gui/mplayer/gui_common.h
@@ -7,9 +7,9 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "app.h"
-#include "bitmap.h"
-#include "wm/ws.h"
+#include "gui/app.h"
+#include "gui/bitmap.h"
+#include "gui/wm/ws.h"
 
 extern inline void TranslateFilename( int c,char * tmp );
 extern char * Translate( char * str );
diff --git a/gui/mplayer/menu.c b/gui/mplayer/menu.c
index a2f966c746..702ebb2351 100644
--- a/gui/mplayer/menu.c
+++ b/gui/mplayer/menu.c
@@ -4,7 +4,7 @@
 #include <inttypes.h>
 
 #include "../config.h"
-#include "app.h"
+#include "gui/app.h"
 #include "gmplayer.h"
 #include "../help_mp.h"
 #include "../mp_msg.h"
diff --git a/gui/mplayer/mw.c b/gui/mplayer/mw.c
index 5252117092..e4cbc9d4dd 100644
--- a/gui/mplayer/mw.c
+++ b/gui/mplayer/mw.c
@@ -10,10 +10,10 @@
 
 #include "../config.h"
 #include "gmplayer.h"
-#include "app.h"
-#include "skin/font.h"
-#include "skin/skin.h"
-#include "wm/ws.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"
diff --git a/gui/mplayer/pb.c b/gui/mplayer/pb.c
index 6249618fc2..6ba874024e 100644
--- a/gui/mplayer/pb.c
+++ b/gui/mplayer/pb.c
@@ -9,10 +9,10 @@
 #include <string.h>
 
 #include "../config.h"
-#include "app.h"
-#include "skin/font.h"
-#include "skin/skin.h"
-#include "wm/ws.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"
diff --git a/gui/mplayer/play.c b/gui/mplayer/play.c
index c77841a03d..820e5de993 100644
--- a/gui/mplayer/play.c
+++ b/gui/mplayer/play.c
@@ -8,24 +8,23 @@
 #include <signal.h>
 
 #include "../config.h"
-#include "wm/ws.h"
-#include "wm/wsxdnd.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 "app.h"
-
-#include "wm/wskeys.h"
-#include "interface.h"
+#include "gui/app.h"
+#include "gui/wm/wskeys.h"
+#include "gui/interface.h"
 
 #include "widgets.h"
 #include "gmplayer.h"
 #include "play.h"
 
-#include "skin/skin.h"
-#include "skin/font.h"
+#include "gui/skin/skin.h"
+#include "gui/skin/font.h"
 
 #include "stream/stream.h"
 
diff --git a/gui/mplayer/sw.c b/gui/mplayer/sw.c
index e4b3205d4c..d4387c3472 100644
--- a/gui/mplayer/sw.c
+++ b/gui/mplayer/sw.c
@@ -8,8 +8,8 @@
 #include "../libvo/x11_common.h"
 
 #include "gmplayer.h"
-#include "app.h"
-#include "interface.h"
+#include "gui/app.h"
+#include "gui/interface.h"
 #include "../help_mp.h"
 #include "widgets.h"
 
diff --git a/gui/mplayer/widgets.c b/gui/mplayer/widgets.c
index 834870d5db..446d36cdbd 100644
--- a/gui/mplayer/widgets.c
+++ b/gui/mplayer/widgets.c
@@ -17,8 +17,8 @@
 
 #include "../config.h"
 #include "widgets.h"
-#include "app.h"
-#include "wm/ws.h"
+#include "gui/app.h"
+#include "gui/wm/ws.h"
 
 
 #include "gtk/menu.h"
diff --git a/gui/mplayer/widgets.h b/gui/mplayer/widgets.h
index b6135f35ac..704fe274bd 100644
--- a/gui/mplayer/widgets.h
+++ b/gui/mplayer/widgets.h
@@ -10,8 +10,8 @@
 #include "../osdep/shmem.h"
 #include "play.h"
 #include "mplayer.h"
-#include "interface.h"
-#include "wm/ws.h"
+#include "gui/interface.h"
+#include "gui/wm/ws.h"
 
 #define GTK_MB_SIMPLE 0
 #define GTK_MB_MODAL 1
diff --git a/gui/skin/font.c b/gui/skin/font.c
index 90210ced4a..d931e10d42 100644
--- a/gui/skin/font.c
+++ b/gui/skin/font.c
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include "app.h"
+#include "gui/app.h"
 #include "skin.h"
 #include "font.h"
 #include "cut.h"
diff --git a/gui/skin/font.h b/gui/skin/font.h
index caeac4c597..7c1e305334 100644
--- a/gui/skin/font.h
+++ b/gui/skin/font.h
@@ -1,8 +1,8 @@
 #ifndef MPLAYER_GUI_FONT_H
 #define MPLAYER_GUI_FONT_H
 
-#include "bitmap.h"
-#include "app.h"
+#include "gui/bitmap.h"
+#include "gui/app.h"
 
 #define fntAlignLeft   0
 #define fntAlignCenter 1
diff --git a/gui/skin/skin.c b/gui/skin/skin.c
index 41dba0b26c..b646c7cfa8 100644
--- a/gui/skin/skin.c
+++ b/gui/skin/skin.c
@@ -5,12 +5,12 @@
 
 #include "cut.h"
 #include "font.h"
-#include "app.h"
+#include "gui/app.h"
 
 #include "../config.h"
 #include "../mp_msg.h"
 #include "../help_mp.h"
-#include "mplayer/widgets.h"
+#include "gui/mplayer/widgets.h"
 #include "libavutil/avstring.h"
 
 //#define MSGL_DBG2 MSGL_STATUS
diff --git a/gui/skin/skin.h b/gui/skin/skin.h
index 0411b27e13..2aafb8c1b0 100644
--- a/gui/skin/skin.h
+++ b/gui/skin/skin.h
@@ -1,7 +1,7 @@
 #ifndef MPLAYER_GUI_SKIN_H
 #define MPLAYER_GUI_SKIN_H
 
-#include "app.h"
+#include "gui/app.h"
 
 extern listItems     * skinAppMPlayer;