Mercurial > mplayer.hg
changeset 17144:0e1471d9da74
Unify include paths, -I.. is in CFLAGS.
| author | diego |
|---|---|
| date | Thu, 08 Dec 2005 22:12:57 +0000 |
| parents | 6e44a1e05769 |
| children | c83fa08bf4da |
| files | Gui/app.c Gui/bitmap.c Gui/cfg.c Gui/interface.c Gui/interface.h Gui/mplayer/common.c Gui/mplayer/common.h Gui/mplayer/gtk/about.c Gui/mplayer/gtk/eq.c Gui/mplayer/gtk/fs.c Gui/mplayer/gtk/mb.c Gui/mplayer/gtk/menu.c Gui/mplayer/gtk/opts.c Gui/mplayer/gtk/pl.c Gui/mplayer/gtk/sb.c Gui/mplayer/gtk/url.c Gui/mplayer/menu.c Gui/mplayer/mw.c Gui/mplayer/pb.c Gui/mplayer/play.c Gui/mplayer/play.h Gui/mplayer/sw.c Gui/mplayer/widgets.c Gui/mplayer/widgets.h Gui/skin/font.c Gui/skin/font.h Gui/skin/skin.c Gui/skin/skin.h Gui/wm/ws.c Gui/wm/wsxdnd.c |
| diffstat | 30 files changed, 188 insertions(+), 188 deletions(-) [+] |
line wrap: on
line diff
--- a/Gui/app.c Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/app.c Thu Dec 08 22:12:57 2005 +0000 @@ -4,9 +4,9 @@ #include <stdio.h> #include <string.h> -#include "../config.h" -#include "../mp_msg.h" -#include "../help_mp.h" +#include "config.h" +#include "mp_msg.h" +#include "help_mp.h" #include "app.h" #include "wm/wskeys.h"
--- a/Gui/bitmap.c Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/bitmap.c Thu Dec 08 22:12:57 2005 +0000 @@ -4,8 +4,8 @@ #include <png.h> -#include "../mp_msg.h" -#include "../help_mp.h" +#include "mp_msg.h" +#include "help_mp.h" #include "bitmap.h" int pngRead( unsigned char * fname,txSample * bf )
--- a/Gui/cfg.c Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/cfg.c Thu Dec 08 22:12:57 2005 +0000 @@ -3,15 +3,15 @@ #include <stdio.h> #include <string.h> -#include "../config.h" -#include "../mp_msg.h" -#include "../help_mp.h" -#include "../mixer.h" -#include "../mplayer.h" -#include "../m_config.h" -#include "../m_option.h" +#include "config.h" +#include "mp_msg.h" +#include "help_mp.h" +#include "mixer.h" +#include "mplayer.h" +#include "m_config.h" +#include "m_option.h" -#include "../../libvo/video_out.h" +#include "libvo/video_out.h" #include "cfg.h" #include "app.h"
--- a/Gui/interface.c Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/interface.c Thu Dec 08 22:12:57 2005 +0000 @@ -15,20 +15,20 @@ #include "mplayer/mplayer.h" #include "mplayer/play.h" -#include "../mplayer.h" +#include "mplayer.h" #include "app.h" #include "cfg.h" -#include "../help_mp.h" -#include "../subreader.h" -#include "../libvo/x11_common.h" -#include "../libvo/video_out.h" -#include "../libvo/font_load.h" -#include "../libvo/sub.h" -#include "../input/input.h" -#include "../libao2/audio_out.h" -#include "../mixer.h" -#include "../libaf/af.h" -#include "../libaf/equalizer.h" +#include "help_mp.h" +#include "subreader.h" +#include "libvo/x11_common.h" +#include "libvo/video_out.h" +#include "libvo/font_load.h" +#include "libvo/sub.h" +#include "input/input.h" +#include "libao2/audio_out.h" +#include "mixer.h" +#include "libaf/af.h" +#include "libaf/equalizer.h" extern af_cfg_t af_cfg; @@ -36,13 +36,13 @@ #include <iconv.h> #endif -#include "../libmpdemux/stream.h" -#include "../libmpdemux/demuxer.h" -#include "../libmpdemux/stheader.h" -#include "../libmpcodecs/dec_video.h" +#include "libmpdemux/stream.h" +#include "libmpdemux/demuxer.h" +#include "libmpdemux/stheader.h" +#include "libmpcodecs/dec_video.h" -#include "../m_config.h" -#include "../m_option.h" +#include "m_config.h" +#include "m_option.h" extern mixer_t mixer; // mixer from mplayer.c @@ -1195,7 +1195,7 @@ #define mp_basename(s) (strrchr(s,'/')==NULL?(char*)s:(strrchr(s,'/')+1)) -#include "../playtree.h" +#include "playtree.h" //This function adds/inserts one file into the gui playlist
--- a/Gui/interface.h Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/interface.h Thu Dec 08 22:12:57 2005 +0000 @@ -2,14 +2,14 @@ #ifndef _INTERFACE_H #define _INTERFACE_H -#include "../config.h" +#include "config.h" #include "mplayer/play.h" -#include "../mplayer.h" -#include "../libvo/font_load.h" +#include "mplayer.h" +#include "libvo/font_load.h" #include "cfg.h" #ifdef USE_DVDREAD - #include "../libmpdemux/stream.h" + #include "libmpdemux/stream.h" #endif typedef struct
--- a/Gui/mplayer/common.c Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/mplayer/common.c Thu Dec 08 22:12:57 2005 +0000 @@ -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 "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 "../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/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 "../libmpdemux/demuxer.h" +#include "../libmpdemux/stheader.h" +#include "../codec-cfg.h" #include "play.h"
--- a/Gui/mplayer/common.h Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/mplayer/common.h Thu Dec 08 22:12:57 2005 +0000 @@ -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 );
--- a/Gui/mplayer/gtk/about.c Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/mplayer/gtk/about.c Thu Dec 08 22:12:57 2005 +0000 @@ -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"
--- a/Gui/mplayer/gtk/eq.c Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/mplayer/gtk/eq.c Thu Dec 08 22:12:57 2005 +0000 @@ -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"
--- a/Gui/mplayer/gtk/fs.c Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/mplayer/gtk/fs.c Thu Dec 08 22:12:57 2005 +0000 @@ -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"
--- a/Gui/mplayer/gtk/mb.c Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/mplayer/gtk/mb.c Thu Dec 08 22:12:57 2005 +0000 @@ -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"
--- a/Gui/mplayer/gtk/menu.c Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/mplayer/gtk/menu.c Thu Dec 08 22:12:57 2005 +0000 @@ -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"
--- a/Gui/mplayer/gtk/opts.c Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/mplayer/gtk/opts.c Thu Dec 08 22:12:57 2005 +0000 @@ -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 "../../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 "../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;
--- a/Gui/mplayer/gtk/pl.c Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/mplayer/gtk/pl.c Thu Dec 08 22:12:57 2005 +0000 @@ -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"
--- a/Gui/mplayer/gtk/sb.c Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/mplayer/gtk/sb.c Thu Dec 08 22:12:57 2005 +0000 @@ -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;
--- a/Gui/mplayer/gtk/url.c Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/mplayer/gtk/url.c Thu Dec 08 22:12:57 2005 +0000 @@ -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;
--- a/Gui/mplayer/menu.c Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/mplayer/menu.c Thu Dec 08 22:12:57 2005 +0000 @@ -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"
--- a/Gui/mplayer/mw.c Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/mplayer/mw.c Thu Dec 08 22:12:57 2005 +0000 @@ -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 "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 "../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/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 "../libmpdemux/demuxer.h" +#include "../libmpdemux/stheader.h" +#include "../codec-cfg.h" #define GUI_REDRAW_WAIT 375
--- a/Gui/mplayer/pb.c Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/mplayer/pb.c Thu Dec 08 22:12:57 2005 +0000 @@ -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 "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 "../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/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 "../libmpdemux/demuxer.h" +#include "../libmpdemux/stheader.h" +#include "../codec-cfg.h" #include "play.h" #include "widgets.h"
--- a/Gui/mplayer/play.c Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/mplayer/play.c Thu Dec 08 22:12:57 2005 +0000 @@ -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;
--- a/Gui/mplayer/play.h Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/mplayer/play.h Thu Dec 08 22:12:57 2005 +0000 @@ -2,7 +2,7 @@ #ifndef __GUI_PLAY_H #define __GUI_PLAY_H -#include "../../config.h" +#include "../config.h" #include "./mplayer.h"
--- a/Gui/mplayer/sw.c Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/mplayer/sw.c Thu Dec 08 22:12:57 2005 +0000 @@ -3,13 +3,13 @@ #include <inttypes.h> -#include "../../config.h" -#include "../../libvo/x11_common.h" -#include "../../libvo/fastmemcpy.h" +#include "../config.h" +#include "../libvo/x11_common.h" +#include "../libvo/fastmemcpy.h" -#include "../app.h" -#include "../interface.h" -#include "../../help_mp.h" +#include "app.h" +#include "interface.h" +#include "../help_mp.h" #include "widgets.h" int mplSubRender = 0;
--- a/Gui/mplayer/widgets.c Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/mplayer/widgets.c Thu Dec 08 22:12:57 2005 +0000 @@ -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;
--- a/Gui/mplayer/widgets.h Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/mplayer/widgets.h Thu Dec 08 22:12:57 2005 +0000 @@ -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
--- a/Gui/skin/font.c Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/skin/font.c Thu Dec 08 22:12:57 2005 +0000 @@ -5,11 +5,11 @@ #include <string.h> #include <inttypes.h> -#include "../app.h" +#include "app.h" #include "skin.h" #include "font.h" #include "cut.h" -#include "../../mp_msg.h" +#include "../mp_msg.h" int items;
--- a/Gui/skin/font.h Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/skin/font.h Thu Dec 08 22:12:57 2005 +0000 @@ -2,8 +2,8 @@ #ifndef _FONT_H #define _FONT_H -#include "../bitmap.h" -#include "../app.h" +#include "bitmap.h" +#include "app.h" #define fntAlignLeft 0 #define fntAlignCenter 1
--- a/Gui/skin/skin.c Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/skin/skin.c Thu Dec 08 22:12:57 2005 +0000 @@ -5,12 +5,12 @@ #include "cut.h" #include "font.h" -#include "../app.h" +#include "app.h" -#include "../../config.h" -#include "../../mp_msg.h" -#include "../../help_mp.h" -#include "../mplayer/widgets.h" +#include "../config.h" +#include "../mp_msg.h" +#include "../help_mp.h" +#include "mplayer/widgets.h" //#define MSGL_DBG2 MSGL_STATUS
--- a/Gui/skin/skin.h Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/skin/skin.h Thu Dec 08 22:12:57 2005 +0000 @@ -2,7 +2,7 @@ #ifndef __MY_SKIN #define __MY_SKIN -#include "../app.h" +#include "app.h" extern listItems * skinAppMPlayer;
--- a/Gui/wm/ws.c Thu Dec 08 22:02:52 2005 +0000 +++ b/Gui/wm/ws.c Thu Dec 08 22:12:57 2005 +0000 @@ -18,18 +18,18 @@ #include <inttypes.h> -#include "../../config.h" -#include "../../libvo/x11_common.h" -#include "../../libvo/video_out.h" +#include "../config.h" +#include "../libvo/x11_common.h" +#include "../libvo/video_out.h" #include "ws.h" #include "wsxdnd.h" -#include "../../cpudetect.h" -#include "../../postproc/swscale.h" -#include "../../postproc/rgb2rgb.h" -#include "../../libmpcodecs/vf_scale.h" -#include "../../mp_msg.h" -#include "../../help_mp.h" -#include "../../mplayer.h" +#include "../cpudetect.h" +#include "../postproc/swscale.h" +#include "../postproc/rgb2rgb.h" +#include "../libmpcodecs/vf_scale.h" +#include "../mp_msg.h" +#include "../help_mp.h" +#include "../mplayer.h" #include <X11/extensions/XShm.h> #ifdef HAVE_XSHAPE