[MPlayer-cvslog] CVS: main/Gui/mplayer/gtk about.c, 1.24, 1.25 eq.c, 1.16, 1.17 fs.c, 1.51, 1.52 mb.c, 1.18, 1.19 menu.c, 1.34, 1.35 opts.c, 1.70, 1.71 pl.c, 1.17, 1.18 sb.c, 1.17, 1.18 url.c, 1.12, 1.13
Diego Biurrun CVS
syncmail at mplayerhq.hu
Thu Dec 8 23:13:01 CET 2005
CVS change done by Diego Biurrun CVS
Update of /cvsroot/mplayer/main/Gui/mplayer/gtk
In directory mail:/var2/tmp/cvs-serv25985/Gui/mplayer/gtk
Modified Files:
about.c eq.c fs.c mb.c menu.c opts.c pl.c sb.c url.c
Log Message:
Unify include paths, -I.. is in CFLAGS.
Index: about.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/about.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- about.c 7 Dec 2005 21:17:29 -0000 1.24
+++ about.c 8 Dec 2005 22:12:56 -0000 1.25
@@ -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"
Index: eq.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/eq.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- eq.c 6 Jan 2005 18:10:36 -0000 1.16
+++ eq.c 8 Dec 2005 22:12:56 -0000 1.17
@@ -9,16 +9,16 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-#include "../../app.h"
-#include "../../cfg.h"
+#include "../app.h"
+#include "../cfg.h"
+#include "../help_mp.h"
+#include "../../config.h"
#include "../../help_mp.h"
-#include "../../../config.h"
-#include "../../../help_mp.h"
-#include "../../../mplayer.h"
-#include "../../../libaf/equalizer.h"
-#include "../../../libvo/video_out.h"
+#include "../../mplayer.h"
+#include "../../libaf/equalizer.h"
+#include "../../libvo/video_out.h"
#include "../widgets.h"
-#include "../mplayer.h"
+#include "mplayer.h"
#include "eq.h"
#include "common.h"
Index: fs.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/fs.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- fs.c 6 Oct 2004 15:46:54 -0000 1.51
+++ fs.c 8 Dec 2005 22:12:56 -0000 1.52
@@ -12,11 +12,11 @@
#include "mplayer/pixmaps/dir.xpm"
#include "mplayer/pixmaps/file.xpm"
-#include "../../app.h"
-#include "../../interface.h"
-#include "../../../config.h"
-#include "../../../help_mp.h"
-#include "../../../libmpdemux/stream.h"
+#include "../app.h"
+#include "../interface.h"
+#include "../../config.h"
+#include "../../help_mp.h"
+#include "../../libmpdemux/stream.h"
#include "../widgets.h"
#include "fs.h"
Index: mb.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/mb.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mb.c 20 Mar 2003 12:42:14 -0000 1.18
+++ mb.c 8 Dec 2005 22:12:56 -0000 1.19
@@ -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"
Index: menu.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/menu.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- menu.c 25 Jan 2005 12:44:38 -0000 1.34
+++ menu.c 8 Dec 2005 22:12:56 -0000 1.35
@@ -3,19 +3,19 @@
#include <stdlib.h>
#include <string.h>
-#include "../../../config.h"
-#include "../../../help_mp.h"
-#include "../../../mplayer.h"
-#include "../../../mixer.h"
+#include "../../config.h"
+#include "../../help_mp.h"
+#include "../../mplayer.h"
+#include "../../mixer.h"
-#include "../../app.h"
+#include "../app.h"
#include "menu.h"
#include "../widgets.h"
-#include "../app.h"
+#include "app.h"
-#include "../../../libmpdemux/stream.h"
-#include "../../../libmpdemux/demuxer.h"
+#include "../../libmpdemux/stream.h"
+#include "../../libmpdemux/demuxer.h"
#include "../pixmaps/ab.xpm"
#include "../pixmaps/half.xpm"
Index: opts.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/opts.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- opts.c 17 Aug 2005 18:41:15 -0000 1.70
+++ opts.c 8 Dec 2005 22:12:56 -0000 1.71
@@ -7,15 +7,15 @@
#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 "../../app.h"
-#include "../../cfg.h"
-#include "../../interface.h"
+#include "../../config.h"
+#include "../../help_mp.h"
+#include "../../mixer.h"
+#include "../../libao2/audio_out.h"
+#include "../../libvo/video_out.h"
+
+#include "../app.h"
+#include "../cfg.h"
+#include "../interface.h"
#include "../widgets.h"
#include "opts.h"
#include "fs.h"
@@ -25,8 +25,8 @@
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;
Index: pl.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/pl.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- pl.c 2 Nov 2004 14:45:02 -0000 1.17
+++ pl.c 8 Dec 2005 22:12:56 -0000 1.18
@@ -10,11 +10,11 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-#include "../../../config.h"
-#include "../../../help_mp.h"
-#include "../../libmpdemux/stream.h"
+#include "../../config.h"
+#include "../../help_mp.h"
+#include "../libmpdemux/stream.h"
-#include "../../interface.h"
+#include "../interface.h"
#include "../widgets.h"
#include "pl.h"
#include "common.h"
Index: sb.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/sb.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sb.c 18 Jan 2003 00:22:18 -0000 1.17
+++ sb.c 8 Dec 2005 22:12:56 -0000 1.18
@@ -9,12 +9,12 @@
#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"
+#include "app.h"
GtkWidget * SkinList = NULL;
char * sbSelectedSkin=NULL;
Index: url.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/url.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- url.c 23 May 2003 12:58:13 -0000 1.12
+++ url.c 8 Dec 2005 22:12:56 -0000 1.13
@@ -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;
More information about the MPlayer-cvslog
mailing list