Author: diego Date: Fri Mar 16 01:00:13 2007 New Revision: 22628 Modified: trunk/Gui/mplayer/gtk/about.c trunk/Gui/mplayer/gtk/eq.c trunk/Gui/mplayer/gtk/fs.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/gtk/url.c Log: Don't look for header files in ../../ anymore. Compilation was broken unless some random subdirectory of the Gui directory was added as header search path to CFLAGS ... Modified: trunk/Gui/mplayer/gtk/about.c ============================================================================== --- trunk/Gui/mplayer/gtk/about.c (original) +++ trunk/Gui/mplayer/gtk/about.c Fri Mar 16 01:00:13 2007 @@ -1,7 +1,7 @@ -#include "../app.h" -#include "../../config.h" -#include "../../help_mp.h" +#include "app.h" +#include "config.h" +#include "help_mp.h" #include "mplayer/pixmaps/about.xpm" #include "../widgets.h" Modified: trunk/Gui/mplayer/gtk/eq.c ============================================================================== --- trunk/Gui/mplayer/gtk/eq.c (original) +++ trunk/Gui/mplayer/gtk/eq.c Fri Mar 16 01:00:13 2007 @@ -9,13 +9,13 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include "../app.h" -#include "../cfg.h" -#include "../../config.h" -#include "../../help_mp.h" -#include "../../mplayer.h" -#include "../../libaf/equalizer.h" -#include "../../libvo/video_out.h" +#include "app.h" +#include "cfg.h" +#include "config.h" +#include "help_mp.h" +#include "mplayer.h" +#include "libaf/equalizer.h" +#include "libvo/video_out.h" #include "../widgets.h" #include "mplayer.h" Modified: trunk/Gui/mplayer/gtk/fs.c ============================================================================== --- trunk/Gui/mplayer/gtk/fs.c (original) +++ trunk/Gui/mplayer/gtk/fs.c Fri Mar 16 01:00:13 2007 @@ -7,17 +7,17 @@ #include <unistd.h> #include "../gmplayer.h" -#include "../../mplayer.h" +#include "mplayer.h" #include "mplayer/pixmaps/up.xpm" #include "mplayer/pixmaps/dir.xpm" #include "mplayer/pixmaps/file.xpm" -#include "../app.h" -#include "../interface.h" -#include "../../config.h" -#include "../../help_mp.h" -#include "../../stream/stream.h" +#include "app.h" +#include "interface.h" +#include "config.h" +#include "help_mp.h" +#include "stream/stream.h" #include "../widgets.h" #include "fs.h" Modified: trunk/Gui/mplayer/gtk/mb.c ============================================================================== --- trunk/Gui/mplayer/gtk/mb.c (original) +++ trunk/Gui/mplayer/gtk/mb.c Fri Mar 16 01:00:13 2007 @@ -1,7 +1,7 @@ -#include "../app.h" -#include "../../config.h" -#include "../../help_mp.h" +#include "app.h" +#include "config.h" +#include "help_mp.h" #include "../pixmaps/error.xpm" #include "../pixmaps/warning.xpm" Modified: trunk/Gui/mplayer/gtk/menu.c ============================================================================== --- trunk/Gui/mplayer/gtk/menu.c (original) +++ trunk/Gui/mplayer/gtk/menu.c Fri Mar 16 01:00:13 2007 @@ -3,21 +3,21 @@ #include <stdlib.h> #include <string.h> -#include "../../config.h" -#include "../../help_mp.h" -#include "../../mplayer.h" -#include "../../access_mpcontext.h" -#include "../../mixer.h" +#include "config.h" +#include "help_mp.h" +#include "mplayer.h" +#include "access_mpcontext.h" +#include "mixer.h" -#include "../app.h" +#include "app.h" #include "menu.h" #include "../widgets.h" #include "app.h" -#include "../../stream/stream.h" -#include "../../libmpdemux/demuxer.h" -#include "../../libmpdemux/stheader.h" +#include "stream/stream.h" +#include "../libmpdemux/demuxer.h" +#include "../libmpdemux/stheader.h" #include "../pixmaps/ab.xpm" #include "../pixmaps/half.xpm" Modified: trunk/Gui/mplayer/gtk/opts.c ============================================================================== --- trunk/Gui/mplayer/gtk/opts.c (original) +++ trunk/Gui/mplayer/gtk/opts.c Fri Mar 16 01:00:13 2007 @@ -7,16 +7,16 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include "../../config.h" -#include "../../help_mp.h" -#include "../../mixer.h" -#include "../../libao2/audio_out.h" -#include "../../libvo/video_out.h" -#include "../../mplayer.h" +#include "config.h" +#include "help_mp.h" +#include "mixer.h" +#include "libao2/audio_out.h" +#include "libvo/video_out.h" +#include "mplayer.h" -#include "../app.h" -#include "../cfg.h" -#include "../interface.h" +#include "app.h" +#include "cfg.h" +#include "interface.h" #include "../widgets.h" #include "opts.h" #include "fs.h" @@ -26,8 +26,8 @@ typedef struct sh_video_t sh_video_t; typedef struct sh_audio_t sh_audio_t; // for mpcodecs_[av]d_drivers: -#include "../../libmpcodecs/vd.h" -#include "../../libmpcodecs/ad.h" +#include "libmpcodecs/vd.h" +#include "libmpcodecs/ad.h" GtkWidget * Preferences = NULL; static GtkWidget * AConfig; Modified: trunk/Gui/mplayer/gtk/pl.c ============================================================================== --- trunk/Gui/mplayer/gtk/pl.c (original) +++ trunk/Gui/mplayer/gtk/pl.c Fri Mar 16 01:00:13 2007 @@ -10,11 +10,11 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include "../../config.h" -#include "../../help_mp.h" -#include "../stream/stream.h" +#include "config.h" +#include "help_mp.h" +#include "stream/stream.h" -#include "../interface.h" +#include "interface.h" #include "../widgets.h" #include "pl.h" #include "common.h" Modified: trunk/Gui/mplayer/gtk/sb.c ============================================================================== --- trunk/Gui/mplayer/gtk/sb.c (original) +++ trunk/Gui/mplayer/gtk/sb.c Fri Mar 16 01:00:13 2007 @@ -9,9 +9,9 @@ #include "sb.h" #include "common.h" -#include "../app.h" -#include "../../config.h" -#include "../../help_mp.h" +#include "app.h" +#include "config.h" +#include "help_mp.h" #include "../widgets.h" #include "app.h" Modified: trunk/Gui/mplayer/gtk/url.c ============================================================================== --- trunk/Gui/mplayer/gtk/url.c (original) +++ trunk/Gui/mplayer/gtk/url.c Fri Mar 16 01:00:13 2007 @@ -11,10 +11,10 @@ #include "url.h" #include "common.h" -#include "../interface.h" -#include "../app.h" +#include "interface.h" +#include "app.h" #include "../widgets.h" -#include "../help_mp.h" +#include "help_mp.h" GtkWidget * URL = NULL;