[MPlayer-cvslog] r26397 - in trunk/gui: mplayer/gtk/about.c mplayer/gtk/eq.c mplayer/gtk/fs.c mplayer/gtk/gtk_url.c mplayer/gtk/mb.c mplayer/gtk/menu.c mplayer/gtk/opts.c mplayer/gtk/pl.c mplayer/gtk/sb.c mplayer/gui_common.c mplayer/gui_common.h mplayer/menu.c mplayer/mw.c mplayer/pb.c mplayer/play.c mplayer/sw.c mplayer/widgets.c mplayer/widgets.h skin/font.c skin/font.h skin/skin.c skin/skin.h
diego
subversion at mplayerhq.hu
Fri Apr 11 18:55:28 CEST 2008
Author: diego
Date: Fri Apr 11 18:55:27 2008
New Revision: 26397
Log:
Add gui/ prefix to some #include paths so that compilation from the
top-level source directory does not fail.
Modified:
trunk/gui/mplayer/gtk/about.c
trunk/gui/mplayer/gtk/eq.c
trunk/gui/mplayer/gtk/fs.c
trunk/gui/mplayer/gtk/gtk_url.c
trunk/gui/mplayer/gtk/mb.c
trunk/gui/mplayer/gtk/menu.c
trunk/gui/mplayer/gtk/opts.c
trunk/gui/mplayer/gtk/pl.c
trunk/gui/mplayer/gtk/sb.c
trunk/gui/mplayer/gui_common.c
trunk/gui/mplayer/gui_common.h
trunk/gui/mplayer/menu.c
trunk/gui/mplayer/mw.c
trunk/gui/mplayer/pb.c
trunk/gui/mplayer/play.c
trunk/gui/mplayer/sw.c
trunk/gui/mplayer/widgets.c
trunk/gui/mplayer/widgets.h
trunk/gui/skin/font.c
trunk/gui/skin/font.h
trunk/gui/skin/skin.c
trunk/gui/skin/skin.h
Modified: trunk/gui/mplayer/gtk/about.c
==============================================================================
--- trunk/gui/mplayer/gtk/about.c (original)
+++ trunk/gui/mplayer/gtk/about.c Fri Apr 11 18:55:27 2008
@@ -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"
Modified: trunk/gui/mplayer/gtk/eq.c
==============================================================================
--- trunk/gui/mplayer/gtk/eq.c (original)
+++ trunk/gui/mplayer/gtk/eq.c Fri Apr 11 18:55:27 2008
@@ -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"
Modified: trunk/gui/mplayer/gtk/fs.c
==============================================================================
--- trunk/gui/mplayer/gtk/fs.c (original)
+++ trunk/gui/mplayer/gtk/fs.c Fri Apr 11 18:55:27 2008
@@ -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"
Modified: trunk/gui/mplayer/gtk/gtk_url.c
==============================================================================
--- trunk/gui/mplayer/gtk/gtk_url.c (original)
+++ trunk/gui/mplayer/gtk/gtk_url.c Fri Apr 11 18:55:27 2008
@@ -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"
Modified: trunk/gui/mplayer/gtk/mb.c
==============================================================================
--- trunk/gui/mplayer/gtk/mb.c (original)
+++ trunk/gui/mplayer/gtk/mb.c Fri Apr 11 18:55:27 2008
@@ -1,5 +1,5 @@
#include "config.h"
-#include "app.h"
+#include "gui/app.h"
#include "help_mp.h"
#include "../pixmaps/error.xpm"
Modified: trunk/gui/mplayer/gtk/menu.c
==============================================================================
--- trunk/gui/mplayer/gtk/menu.c (original)
+++ trunk/gui/mplayer/gtk/menu.c Fri Apr 11 18:55:27 2008
@@ -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"
Modified: trunk/gui/mplayer/gtk/opts.c
==============================================================================
--- trunk/gui/mplayer/gtk/opts.c (original)
+++ trunk/gui/mplayer/gtk/opts.c Fri Apr 11 18:55:27 2008
@@ -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"
Modified: trunk/gui/mplayer/gtk/pl.c
==============================================================================
--- trunk/gui/mplayer/gtk/pl.c (original)
+++ trunk/gui/mplayer/gtk/pl.c Fri Apr 11 18:55:27 2008
@@ -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"
Modified: trunk/gui/mplayer/gtk/sb.c
==============================================================================
--- trunk/gui/mplayer/gtk/sb.c (original)
+++ trunk/gui/mplayer/gtk/sb.c Fri Apr 11 18:55:27 2008
@@ -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"
Modified: trunk/gui/mplayer/gui_common.c
==============================================================================
--- trunk/gui/mplayer/gui_common.c (original)
+++ trunk/gui/mplayer/gui_common.c Fri Apr 11 18:55:27 2008
@@ -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"
Modified: trunk/gui/mplayer/gui_common.h
==============================================================================
--- trunk/gui/mplayer/gui_common.h (original)
+++ trunk/gui/mplayer/gui_common.h Fri Apr 11 18:55:27 2008
@@ -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 );
Modified: trunk/gui/mplayer/menu.c
==============================================================================
--- trunk/gui/mplayer/menu.c (original)
+++ trunk/gui/mplayer/menu.c Fri Apr 11 18:55:27 2008
@@ -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"
Modified: trunk/gui/mplayer/mw.c
==============================================================================
--- trunk/gui/mplayer/mw.c (original)
+++ trunk/gui/mplayer/mw.c Fri Apr 11 18:55:27 2008
@@ -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"
Modified: trunk/gui/mplayer/pb.c
==============================================================================
--- trunk/gui/mplayer/pb.c (original)
+++ trunk/gui/mplayer/pb.c Fri Apr 11 18:55:27 2008
@@ -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"
Modified: trunk/gui/mplayer/play.c
==============================================================================
--- trunk/gui/mplayer/play.c (original)
+++ trunk/gui/mplayer/play.c Fri Apr 11 18:55:27 2008
@@ -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"
Modified: trunk/gui/mplayer/sw.c
==============================================================================
--- trunk/gui/mplayer/sw.c (original)
+++ trunk/gui/mplayer/sw.c Fri Apr 11 18:55:27 2008
@@ -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"
Modified: trunk/gui/mplayer/widgets.c
==============================================================================
--- trunk/gui/mplayer/widgets.c (original)
+++ trunk/gui/mplayer/widgets.c Fri Apr 11 18:55:27 2008
@@ -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"
Modified: trunk/gui/mplayer/widgets.h
==============================================================================
--- trunk/gui/mplayer/widgets.h (original)
+++ trunk/gui/mplayer/widgets.h Fri Apr 11 18:55:27 2008
@@ -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
Modified: trunk/gui/skin/font.c
==============================================================================
--- trunk/gui/skin/font.c (original)
+++ trunk/gui/skin/font.c Fri Apr 11 18:55:27 2008
@@ -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"
Modified: trunk/gui/skin/font.h
==============================================================================
--- trunk/gui/skin/font.h (original)
+++ trunk/gui/skin/font.h Fri Apr 11 18:55:27 2008
@@ -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
Modified: trunk/gui/skin/skin.c
==============================================================================
--- trunk/gui/skin/skin.c (original)
+++ trunk/gui/skin/skin.c Fri Apr 11 18:55:27 2008
@@ -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
Modified: trunk/gui/skin/skin.h
==============================================================================
--- trunk/gui/skin/skin.h (original)
+++ trunk/gui/skin/skin.h Fri Apr 11 18:55:27 2008
@@ -1,7 +1,7 @@
#ifndef MPLAYER_GUI_SKIN_H
#define MPLAYER_GUI_SKIN_H
-#include "app.h"
+#include "gui/app.h"
extern listItems * skinAppMPlayer;
More information about the MPlayer-cvslog
mailing list