# HG changeset patch
# User ib
# Date 1308414937 0
# Node ID 71ec25d1da108b0da9141e049281632673bc0b86
# Parent  520fb0f7544cf7c4ebdd540a978c12e455e798ae
Fix compilation after r33644.

Some include file changes apparently got lost.

diff -r 520fb0f7544c -r 71ec25d1da10 gui/ui/gtk/about.c
--- a/gui/ui/gtk/about.c	Sat Jun 18 16:03:31 2011 +0000
+++ b/gui/ui/gtk/about.c	Sat Jun 18 16:35:37 2011 +0000
@@ -20,8 +20,8 @@
 #include "gui/app.h"
 #include "help_mp.h"
 
-#include "gui/mplayer/pixmaps/about.xpm"
-#include "gui/mplayer/widgets.h"
+#include "gui/ui/pixmaps/about.xpm"
+#include "gui/ui/widgets.h"
 #include "about.h"
 #include "gtk_common.h"
 
diff -r 520fb0f7544c -r 71ec25d1da10 gui/ui/gtk/eq.c
--- a/gui/ui/gtk/eq.c	Sat Jun 18 16:03:31 2011 +0000
+++ b/gui/ui/gtk/eq.c	Sat Jun 18 16:35:37 2011 +0000
@@ -36,7 +36,7 @@
 #include "libmpdemux/demuxer.h"
 #include "libmpdemux/stheader.h"
 #include "libmpcodecs/dec_video.h"
-#include "gui/mplayer/widgets.h"
+#include "gui/ui/widgets.h"
 
 #include "eq.h"
 #include "gtk_common.h"
diff -r 520fb0f7544c -r 71ec25d1da10 gui/ui/gtk/fs.c
--- a/gui/ui/gtk/fs.c	Sat Jun 18 16:03:31 2011 +0000
+++ b/gui/ui/gtk/fs.c	Sat Jun 18 16:35:37 2011 +0000
@@ -24,11 +24,11 @@
 #include <unistd.h>
 
 #include "config.h"
-#include "gui/mplayer/gmplayer.h"
+#include "gui/ui/gmplayer.h"
 
-#include "gui/mplayer/pixmaps/up.xpm"
-#include "gui/mplayer/pixmaps/dir.xpm"
-#include "gui/mplayer/pixmaps/file.xpm"
+#include "gui/ui/pixmaps/up.xpm"
+#include "gui/ui/pixmaps/dir.xpm"
+#include "gui/ui/pixmaps/file.xpm"
 
 #include "gui/app.h"
 #include "gui/interface.h"
@@ -36,7 +36,7 @@
 #include "mpcommon.h"
 #include "stream/stream.h"
 
-#include "gui/mplayer/widgets.h"
+#include "gui/ui/widgets.h"
 #include "fs.h"
 #include "opts.h"
 #include "gtk_common.h"
diff -r 520fb0f7544c -r 71ec25d1da10 gui/ui/gtk/gtk_menu.c
--- a/gui/ui/gtk/gtk_menu.c	Sat Jun 18 16:03:31 2011 +0000
+++ b/gui/ui/gtk/gtk_menu.c	Sat Jun 18 16:35:37 2011 +0000
@@ -27,8 +27,8 @@
 #include "mpcommon.h"
 
 #include "gtk_menu.h"
-#include "gui/mplayer/widgets.h"
-#include "gui/mplayer/gmplayer.h"
+#include "gui/ui/widgets.h"
+#include "gui/ui/gmplayer.h"
 #include "gui/app.h"
 
 #include "stream/stream.h"
@@ -36,47 +36,47 @@
 #include "libmpdemux/stheader.h"
 #include "libavutil/avstring.h"
 
-#include "gui/mplayer/pixmaps/ab.xpm"
-#include "gui/mplayer/pixmaps/half.xpm"
-#include "gui/mplayer/pixmaps/normal.xpm"
-#include "gui/mplayer/pixmaps/double.xpm"
-#include "gui/mplayer/pixmaps/fs.xpm"
-#include "gui/mplayer/pixmaps/exit.xpm"
-#include "gui/mplayer/pixmaps/prefs.xpm"
-#include "gui/mplayer/pixmaps/eq.xpm"
-#include "gui/mplayer/pixmaps/pl.xpm"
-#include "gui/mplayer/pixmaps/skin.xpm"
-#include "gui/mplayer/pixmaps/sound.xpm"
-#include "gui/mplayer/pixmaps/open.xpm"
-#include "gui/mplayer/pixmaps/play.xpm"
-#include "gui/mplayer/pixmaps/stop2.xpm"
-#include "gui/mplayer/pixmaps/pause.xpm"
-#include "gui/mplayer/pixmaps/prev.xpm"
-#include "gui/mplayer/pixmaps/next.xpm"
-#include "gui/mplayer/pixmaps/aspect.xpm"
-#include "gui/mplayer/pixmaps/a11.xpm"
-#include "gui/mplayer/pixmaps/a169.xpm"
-#include "gui/mplayer/pixmaps/a235.xpm"
-#include "gui/mplayer/pixmaps/a43.xpm"
-#include "gui/mplayer/pixmaps/file2.xpm"
-#include "gui/mplayer/pixmaps/url.xpm"
-#include "gui/mplayer/pixmaps/sub.xpm"
-#include "gui/mplayer/pixmaps/delsub.xpm"
-#include "gui/mplayer/pixmaps/empty.xpm"
-#include "gui/mplayer/pixmaps/loadeaf.xpm"
-#include "gui/mplayer/pixmaps/title.xpm"
+#include "gui/ui/pixmaps/ab.xpm"
+#include "gui/ui/pixmaps/half.xpm"
+#include "gui/ui/pixmaps/normal.xpm"
+#include "gui/ui/pixmaps/double.xpm"
+#include "gui/ui/pixmaps/fs.xpm"
+#include "gui/ui/pixmaps/exit.xpm"
+#include "gui/ui/pixmaps/prefs.xpm"
+#include "gui/ui/pixmaps/eq.xpm"
+#include "gui/ui/pixmaps/pl.xpm"
+#include "gui/ui/pixmaps/skin.xpm"
+#include "gui/ui/pixmaps/sound.xpm"
+#include "gui/ui/pixmaps/open.xpm"
+#include "gui/ui/pixmaps/play.xpm"
+#include "gui/ui/pixmaps/stop2.xpm"
+#include "gui/ui/pixmaps/pause.xpm"
+#include "gui/ui/pixmaps/prev.xpm"
+#include "gui/ui/pixmaps/next.xpm"
+#include "gui/ui/pixmaps/aspect.xpm"
+#include "gui/ui/pixmaps/a11.xpm"
+#include "gui/ui/pixmaps/a169.xpm"
+#include "gui/ui/pixmaps/a235.xpm"
+#include "gui/ui/pixmaps/a43.xpm"
+#include "gui/ui/pixmaps/file2.xpm"
+#include "gui/ui/pixmaps/url.xpm"
+#include "gui/ui/pixmaps/sub.xpm"
+#include "gui/ui/pixmaps/delsub.xpm"
+#include "gui/ui/pixmaps/empty.xpm"
+#include "gui/ui/pixmaps/loadeaf.xpm"
+#include "gui/ui/pixmaps/title.xpm"
 #ifdef CONFIG_DVDREAD
-#include "gui/mplayer/pixmaps/dvd.xpm"
-#include "gui/mplayer/pixmaps/playdvd.xpm"
-#include "gui/mplayer/pixmaps/chapter.xpm"
-#include "gui/mplayer/pixmaps/dolby.xpm"
-#include "gui/mplayer/pixmaps/tongue.xpm"
-#include "gui/mplayer/pixmaps/tonguebla.xpm"
-#include "gui/mplayer/pixmaps/empty1px.xpm"
+#include "gui/ui/pixmaps/dvd.xpm"
+#include "gui/ui/pixmaps/playdvd.xpm"
+#include "gui/ui/pixmaps/chapter.xpm"
+#include "gui/ui/pixmaps/dolby.xpm"
+#include "gui/ui/pixmaps/tongue.xpm"
+#include "gui/ui/pixmaps/tonguebla.xpm"
+#include "gui/ui/pixmaps/empty1px.xpm"
 #endif
 #ifdef CONFIG_VCD
-#include "gui/mplayer/pixmaps/vcd.xpm"
-#include "gui/mplayer/pixmaps/playvcd.xpm"
+#include "gui/ui/pixmaps/vcd.xpm"
+#include "gui/ui/pixmaps/playvcd.xpm"
 #endif
 
 static void ActivateMenuItem( int Item )
diff -r 520fb0f7544c -r 71ec25d1da10 gui/ui/gtk/gtk_url.c
--- a/gui/ui/gtk/gtk_url.c	Sat Jun 18 16:03:31 2011 +0000
+++ b/gui/ui/gtk/gtk_url.c	Sat Jun 18 16:35:37 2011 +0000
@@ -30,8 +30,8 @@
 #include "gtk_common.h"
 #include "gui/interface.h"
 #include "gui/app.h"
-#include "gui/mplayer/gmplayer.h"
-#include "gui/mplayer/widgets.h"
+#include "gui/ui/gmplayer.h"
+#include "gui/ui/widgets.h"
 #include "help_mp.h"
 
 GtkWidget * URL = NULL;
diff -r 520fb0f7544c -r 71ec25d1da10 gui/ui/gtk/mb.c
--- a/gui/ui/gtk/mb.c	Sat Jun 18 16:03:31 2011 +0000
+++ b/gui/ui/gtk/mb.c	Sat Jun 18 16:35:37 2011 +0000
@@ -20,10 +20,10 @@
 #include "gui/app.h"
 #include "help_mp.h"
 
-#include "gui/mplayer/pixmaps/error.xpm"
-#include "gui/mplayer/pixmaps/warning.xpm"
+#include "gui/ui/pixmaps/error.xpm"
+#include "gui/ui/pixmaps/warning.xpm"
 
-#include "gui/mplayer/widgets.h"
+#include "gui/ui/widgets.h"
 #include "mb.h"
 #include "gtk_common.h"
 
diff -r 520fb0f7544c -r 71ec25d1da10 gui/ui/gtk/opts.c
--- a/gui/ui/gtk/opts.c	Sat Jun 18 16:03:31 2011 +0000
+++ b/gui/ui/gtk/opts.c	Sat Jun 18 16:35:37 2011 +0000
@@ -42,8 +42,8 @@
 #include "gui/app.h"
 #include "gui/cfg.h"
 #include "gui/interface.h"
-#include "gui/mplayer/gmplayer.h"
-#include "gui/mplayer/widgets.h"
+#include "gui/ui/gmplayer.h"
+#include "gui/ui/widgets.h"
 #include "opts.h"
 #include "fs.h"
 #include "gtk_common.h"
diff -r 520fb0f7544c -r 71ec25d1da10 gui/ui/gtk/pl.c
--- a/gui/ui/gtk/pl.c	Sat Jun 18 16:03:31 2011 +0000
+++ b/gui/ui/gtk/pl.c	Sat Jun 18 16:35:37 2011 +0000
@@ -32,7 +32,7 @@
 #include "stream/stream.h"
 
 #include "gui/interface.h"
-#include "gui/mplayer/widgets.h"
+#include "gui/ui/widgets.h"
 #include "pl.h"
 #include "gtk_common.h"
 
diff -r 520fb0f7544c -r 71ec25d1da10 gui/ui/gtk/sb.c
--- a/gui/ui/gtk/sb.c	Sat Jun 18 16:03:31 2011 +0000
+++ b/gui/ui/gtk/sb.c	Sat Jun 18 16:35:37 2011 +0000
@@ -30,7 +30,7 @@
 #include "gui/app.h"
 #include "help_mp.h"
 
-#include "gui/mplayer/widgets.h"
+#include "gui/ui/widgets.h"
 
 GtkWidget * SkinList = NULL;
 char      * sbSelectedSkin=NULL;
diff -r 520fb0f7544c -r 71ec25d1da10 gui/win32/gui.c
--- a/gui/win32/gui.c	Sat Jun 18 16:03:31 2011 +0000
+++ b/gui/win32/gui.c	Sat Jun 18 16:35:37 2011 +0000
@@ -41,7 +41,7 @@
 #include "libvo/video_out.h"
 #include "libmpcodecs/vd.h"
 #include "gui/interface.h"
-#include "gui/mplayer/gmplayer.h"
+#include "gui/ui/gmplayer.h"
 #include "gui.h"
 #include "dialogs.h"
 
diff -r 520fb0f7544c -r 71ec25d1da10 gui/win32/interface.c
--- a/gui/win32/interface.c	Sat Jun 18 16:03:31 2011 +0000
+++ b/gui/win32/interface.c	Sat Jun 18 16:35:37 2011 +0000
@@ -48,7 +48,7 @@
 #include "access_mpcontext.h"
 #include "libmpcodecs/vd.h"
 #include "libmpcodecs/dec_audio.h"
-#include "gui/mplayer/gmplayer.h"
+#include "gui/ui/gmplayer.h"
 #include "mp_core.h"
 #include "mpcommon.h"
 #include "gui.h"
diff -r 520fb0f7544c -r 71ec25d1da10 gui/win32/preferences.c
--- a/gui/win32/preferences.c	Sat Jun 18 16:03:31 2011 +0000
+++ b/gui/win32/preferences.c	Sat Jun 18 16:35:37 2011 +0000
@@ -31,7 +31,7 @@
 #include "libao2/audio_out.h"
 #include "osdep/priority.h"
 #include "mixer.h"
-#include "gui/mplayer/gmplayer.h"
+#include "gui/ui/gmplayer.h"
 #include "gui/interface.h"
 #include "gui.h"
 #include "mp_msg.h"
diff -r 520fb0f7544c -r 71ec25d1da10 gui/win32/wincfg.c
--- a/gui/win32/wincfg.c	Sat Jun 18 16:03:31 2011 +0000
+++ b/gui/win32/wincfg.c	Sat Jun 18 16:35:37 2011 +0000
@@ -34,7 +34,7 @@
 #include "libvo/video_out.h"
 #include "osdep/priority.h"
 #include "mixer.h"
-#include "gui/mplayer/gmplayer.h"
+#include "gui/ui/gmplayer.h"
 #include "gui/interface.h"
 #include "gui.h"