[MPlayer-cvslog] CVS: main/Gui/mplayer common.c, 1.9, 1.10 common.h, 1.2, 1.3 menu.c, 1.17, 1.18 mw.c, 1.116, 1.117 pb.c, 1.6, 1.7 play.c, 1.90, 1.91 play.h, 1.30, 1.31 sw.c, 1.42, 1.43 widgets.c, 1.46, 1.47 widgets.h, 1.20, 1.21
Diego Biurrun CVS
syncmail at mplayerhq.hu
Thu Dec 8 23:13:00 CET 2005
- Previous message: [MPlayer-cvslog] CVS: main/Gui app.c, 1.24, 1.25 bitmap.c, 1.13, 1.14 cfg.c, 1.44, 1.45 interface.c, 1.106, 1.107 interface.h, 1.39, 1.40
- Next message: [MPlayer-cvslog] CVS: main/Gui/skin font.c, 1.17, 1.18 font.h, 1.7, 1.8 skin.c, 1.28, 1.29 skin.h, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
CVS change done by Diego Biurrun CVS
Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mail:/var2/tmp/cvs-serv25985/Gui/mplayer
Modified Files:
common.c common.h menu.c mw.c pb.c play.c play.h sw.c
widgets.c widgets.h
Log Message:
Unify include paths, -I.. is in CFLAGS.
Index: common.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/common.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- common.c 28 Aug 2004 20:20:40 -0000 1.9
+++ common.c 8 Dec 2005 22:12:56 -0000 1.10
@@ -7,24 +7,24 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "../app.h"
-#include "../skin/font.h"
-#include "../skin/skin.h"
-#include "../wm/ws.h"
-
-#include "../../config.h"
-#include "../../help_mp.h"
-#include "../../libvo/x11_common.h"
-#include "../../libvo/fastmemcpy.h"
-
-#include "../../libmpdemux/stream.h"
-#include "../../mixer.h"
-#include "../../libvo/sub.h"
-#include "../../mplayer.h"
-
-#include "../../libmpdemux/demuxer.h"
-#include "../../libmpdemux/stheader.h"
-#include "../../codec-cfg.h"
+#include "app.h"
+#include "skin/font.h"
+#include "skin/skin.h"
+#include "wm/ws.h"
+
+#include "../config.h"
+#include "../help_mp.h"
+#include "../libvo/x11_common.h"
+#include "../libvo/fastmemcpy.h"
+
+#include "../libmpdemux/stream.h"
+#include "../mixer.h"
+#include "../libvo/sub.h"
+#include "../mplayer.h"
+
+#include "../libmpdemux/demuxer.h"
+#include "../libmpdemux/stheader.h"
+#include "../codec-cfg.h"
#include "play.h"
Index: common.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/common.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- common.h 26 Jun 2004 13:54:20 -0000 1.2
+++ common.h 8 Dec 2005 22:12:56 -0000 1.3
@@ -7,9 +7,9 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "../app.h"
-#include "../bitmap.h"
-#include "../wm/ws.h"
+#include "app.h"
+#include "bitmap.h"
+#include "wm/ws.h"
extern inline void TranslateFilename( int c,char * tmp );
extern char * Translate( char * str );
Index: menu.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/menu.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- menu.c 26 May 2003 08:45:42 -0000 1.17
+++ menu.c 8 Dec 2005 22:12:56 -0000 1.18
@@ -3,10 +3,10 @@
#include <stdio.h>
#include <inttypes.h>
-#include "../app.h"
-#include "../../config.h"
-#include "../../help_mp.h"
-#include "../../mp_msg.h"
+#include "app.h"
+#include "../config.h"
+#include "../help_mp.h"
+#include "../mp_msg.h"
#include "widgets.h"
Index: mw.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- mw.c 4 Dec 2005 15:58:52 -0000 1.116
+++ mw.c 8 Dec 2005 22:12:56 -0000 1.117
@@ -7,24 +7,24 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "../app.h"
-#include "../skin/font.h"
-#include "../skin/skin.h"
-#include "../wm/ws.h"
-
-#include "../../config.h"
-#include "../../help_mp.h"
-#include "../../libvo/x11_common.h"
-#include "../../libvo/fastmemcpy.h"
-
-#include "../../libmpdemux/stream.h"
-#include "../../mixer.h"
-#include "../../libvo/sub.h"
-#include "../../mplayer.h"
-
-#include "../../libmpdemux/demuxer.h"
-#include "../../libmpdemux/stheader.h"
-#include "../../codec-cfg.h"
+#include "app.h"
+#include "skin/font.h"
+#include "skin/skin.h"
+#include "wm/ws.h"
+
+#include "../config.h"
+#include "../help_mp.h"
+#include "../libvo/x11_common.h"
+#include "../libvo/fastmemcpy.h"
+
+#include "../libmpdemux/stream.h"
+#include "../mixer.h"
+#include "../libvo/sub.h"
+#include "../mplayer.h"
+
+#include "../libmpdemux/demuxer.h"
+#include "../libmpdemux/stheader.h"
+#include "../codec-cfg.h"
#define GUI_REDRAW_WAIT 375
Index: pb.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/pb.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pb.c 4 Dec 2005 15:58:52 -0000 1.6
+++ pb.c 8 Dec 2005 22:12:56 -0000 1.7
@@ -7,24 +7,24 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "../app.h"
-#include "../skin/font.h"
-#include "../skin/skin.h"
-#include "../wm/ws.h"
-
-#include "../../config.h"
-#include "../../help_mp.h"
-#include "../../libvo/x11_common.h"
-#include "../../libvo/fastmemcpy.h"
-
-#include "../../libmpdemux/stream.h"
-#include "../../mixer.h"
-#include "../../libvo/sub.h"
-#include "../../mplayer.h"
-
-#include "../../libmpdemux/demuxer.h"
-#include "../../libmpdemux/stheader.h"
-#include "../../codec-cfg.h"
+#include "app.h"
+#include "skin/font.h"
+#include "skin/skin.h"
+#include "wm/ws.h"
+
+#include "../config.h"
+#include "../help_mp.h"
+#include "../libvo/x11_common.h"
+#include "../libvo/fastmemcpy.h"
+
+#include "../libmpdemux/stream.h"
+#include "../mixer.h"
+#include "../libvo/sub.h"
+#include "../mplayer.h"
+
+#include "../libmpdemux/demuxer.h"
+#include "../libmpdemux/stheader.h"
+#include "../codec-cfg.h"
#include "play.h"
#include "widgets.h"
Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- play.c 21 Aug 2005 10:19:25 -0000 1.90
+++ play.c 8 Dec 2005 22:12:56 -0000 1.91
@@ -7,28 +7,28 @@
#include <unistd.h>
#include <signal.h>
-#include "../wm/ws.h"
-#include "../wm/wsxdnd.h"
-#include "../../config.h"
-#include "../../help_mp.h"
-#include "../../mplayer.h"
-#include "../../libvo/x11_common.h"
-#include "../../libvo/video_out.h"
-#include "../../input/input.h"
+#include "wm/ws.h"
+#include "wm/wsxdnd.h"
+#include "../config.h"
+#include "../help_mp.h"
+#include "../mplayer.h"
+#include "../libvo/x11_common.h"
+#include "../libvo/video_out.h"
+#include "../input/input.h"
-#include "../app.h"
+#include "app.h"
-#include "../wm/wskeys.h"
-#include "../interface.h"
+#include "wm/wskeys.h"
+#include "interface.h"
#include "widgets.h"
#include "./mplayer.h"
#include "play.h"
-#include "../skin/skin.h"
-#include "../skin/font.h"
+#include "skin/skin.h"
+#include "skin/font.h"
-#include "../libmpdemux/stream.h"
+#include "libmpdemux/stream.h"
extern float rel_seek_secs;
extern int abs_seek_pos;
Index: play.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- play.h 26 May 2003 08:34:15 -0000 1.30
+++ play.h 8 Dec 2005 22:12:56 -0000 1.31
@@ -2,7 +2,7 @@
#ifndef __GUI_PLAY_H
#define __GUI_PLAY_H
-#include "../../config.h"
+#include "../config.h"
#include "./mplayer.h"
Index: sw.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/sw.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sw.c 4 Dec 2005 15:58:52 -0000 1.42
+++ sw.c 8 Dec 2005 22:12:56 -0000 1.43
@@ -3,13 +3,13 @@
#include <inttypes.h>
-#include "../../config.h"
-#include "../../libvo/x11_common.h"
-#include "../../libvo/fastmemcpy.h"
-
-#include "../app.h"
-#include "../interface.h"
-#include "../../help_mp.h"
+#include "../config.h"
+#include "../libvo/x11_common.h"
+#include "../libvo/fastmemcpy.h"
+
+#include "app.h"
+#include "interface.h"
+#include "../help_mp.h"
#include "widgets.h"
int mplSubRender = 0;
Index: widgets.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/widgets.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- widgets.c 4 Dec 2005 15:58:52 -0000 1.46
+++ widgets.c 8 Dec 2005 22:12:56 -0000 1.47
@@ -18,17 +18,17 @@
#include "widgets.h"
#include "./mplayer.h"
-#include "../app.h"
-#include "../wm/ws.h"
+#include "app.h"
+#include "wm/ws.h"
#include "gtk/menu.h"
#include "play.h"
#include "gtk/fs.h"
-#include "../../config.h"
-#include "../../help_mp.h"
-#include "../../mp_msg.h"
+#include "../config.h"
+#include "../help_mp.h"
+#include "../mp_msg.h"
GtkWidget * PopUpMenu = NULL;
Index: widgets.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/widgets.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- widgets.h 9 Feb 2003 20:18:16 -0000 1.20
+++ widgets.h 8 Dec 2005 22:12:56 -0000 1.21
@@ -7,12 +7,12 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-#include "../../config.h"
-#include "../../osdep/shmem.h"
+#include "../config.h"
+#include "../osdep/shmem.h"
#include "play.h"
#include "mplayer.h"
-#include "../interface.h"
-#include "../wm/ws.h"
+#include "interface.h"
+#include "wm/ws.h"
#define GTK_MB_SIMPLE 0
#define GTK_MB_MODAL 1
- Previous message: [MPlayer-cvslog] CVS: main/Gui app.c, 1.24, 1.25 bitmap.c, 1.13, 1.14 cfg.c, 1.44, 1.45 interface.c, 1.106, 1.107 interface.h, 1.39, 1.40
- Next message: [MPlayer-cvslog] CVS: main/Gui/skin font.c, 1.17, 1.18 font.h, 1.7, 1.8 skin.c, 1.28, 1.29 skin.h, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the MPlayer-cvslog
mailing list