From 2a90e559a97e6a77f2caaf8975f4333c2b8766f3 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 29 Aug 2008 22:29:27 +0000 Subject: consistency cosmetics: Avoid using .. in #include paths. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27495 b3059339-0415-0410-9bf9-f77b7e298cf2 --- gui/mplayer/gtk/mb.c | 4 +-- gui/mplayer/gtk/menu.c | 76 +++++++++++++++++++++---------------------- stream/librtsp/rtsp_rtp.c | 4 +-- stream/librtsp/rtsp_session.c | 12 +++---- stream/realrtsp/real.c | 2 +- stream/realrtsp/real.h | 2 +- stream/realrtsp/sdpplin.c | 2 +- stream/realrtsp/sdpplin.h | 2 +- 8 files changed, 52 insertions(+), 52 deletions(-) diff --git a/gui/mplayer/gtk/mb.c b/gui/mplayer/gtk/mb.c index 0bb0188e62..4d2a3fa676 100644 --- a/gui/mplayer/gtk/mb.c +++ b/gui/mplayer/gtk/mb.c @@ -20,8 +20,8 @@ #include "gui/app.h" #include "help_mp.h" -#include "../pixmaps/error.xpm" -#include "../pixmaps/warning.xpm" +#include "gui/mplayer/pixmaps/error.xpm" +#include "gui/mplayer/pixmaps/warning.xpm" #include "gui/mplayer/widgets.h" #include "mb.h" diff --git a/gui/mplayer/gtk/menu.c b/gui/mplayer/gtk/menu.c index beac3325c1..a13e85560a 100644 --- a/gui/mplayer/gtk/menu.c +++ b/gui/mplayer/gtk/menu.c @@ -34,47 +34,47 @@ #include "libmpdemux/demuxer.h" #include "libmpdemux/stheader.h" -#include "../pixmaps/ab.xpm" -#include "../pixmaps/half.xpm" -#include "../pixmaps/normal.xpm" -#include "../pixmaps/double.xpm" -#include "../pixmaps/fs.xpm" -#include "../pixmaps/exit.xpm" -#include "../pixmaps/prefs.xpm" -#include "../pixmaps/eq.xpm" -#include "../pixmaps/pl.xpm" -#include "../pixmaps/skin.xpm" -#include "../pixmaps/sound.xpm" -#include "../pixmaps/open.xpm" -#include "../pixmaps/play.xpm" -#include "../pixmaps/stop2.xpm" -#include "../pixmaps/pause.xpm" -#include "../pixmaps/prev.xpm" -#include "../pixmaps/next.xpm" -#include "../pixmaps/aspect.xpm" -#include "../pixmaps/a11.xpm" -#include "../pixmaps/a169.xpm" -#include "../pixmaps/a235.xpm" -#include "../pixmaps/a43.xpm" -#include "../pixmaps/file2.xpm" -#include "../pixmaps/url.xpm" -#include "../pixmaps/sub.xpm" -#include "../pixmaps/delsub.xpm" -#include "../pixmaps/empty.xpm" -#include "../pixmaps/loadeaf.xpm" -#include "../pixmaps/title.xpm" +#include "gui/mplayer/pixmaps/ab.xpm" +#include "gui/mplayer/pixmaps/half.xpm" +#include "gui/mplayer/pixmaps/normal.xpm" +#include "gui/mplayer/pixmaps/double.xpm" +#include "gui/mplayer/pixmaps/fs.xpm" +#include "gui/mplayer/pixmaps/exit.xpm" +#include "gui/mplayer/pixmaps/prefs.xpm" +#include "gui/mplayer/pixmaps/eq.xpm" +#include "gui/mplayer/pixmaps/pl.xpm" +#include "gui/mplayer/pixmaps/skin.xpm" +#include "gui/mplayer/pixmaps/sound.xpm" +#include "gui/mplayer/pixmaps/open.xpm" +#include "gui/mplayer/pixmaps/play.xpm" +#include "gui/mplayer/pixmaps/stop2.xpm" +#include "gui/mplayer/pixmaps/pause.xpm" +#include "gui/mplayer/pixmaps/prev.xpm" +#include "gui/mplayer/pixmaps/next.xpm" +#include "gui/mplayer/pixmaps/aspect.xpm" +#include "gui/mplayer/pixmaps/a11.xpm" +#include "gui/mplayer/pixmaps/a169.xpm" +#include "gui/mplayer/pixmaps/a235.xpm" +#include "gui/mplayer/pixmaps/a43.xpm" +#include "gui/mplayer/pixmaps/file2.xpm" +#include "gui/mplayer/pixmaps/url.xpm" +#include "gui/mplayer/pixmaps/sub.xpm" +#include "gui/mplayer/pixmaps/delsub.xpm" +#include "gui/mplayer/pixmaps/empty.xpm" +#include "gui/mplayer/pixmaps/loadeaf.xpm" +#include "gui/mplayer/pixmaps/title.xpm" #ifdef CONFIG_DVDREAD -#include "../pixmaps/dvd.xpm" -#include "../pixmaps/playdvd.xpm" -#include "../pixmaps/chapter.xpm" -#include "../pixmaps/dolby.xpm" -#include "../pixmaps/tongue.xpm" -#include "../pixmaps/tonguebla.xpm" -#include "../pixmaps/empty1px.xpm" +#include "gui/mplayer/pixmaps/dvd.xpm" +#include "gui/mplayer/pixmaps/playdvd.xpm" +#include "gui/mplayer/pixmaps/chapter.xpm" +#include "gui/mplayer/pixmaps/dolby.xpm" +#include "gui/mplayer/pixmaps/tongue.xpm" +#include "gui/mplayer/pixmaps/tonguebla.xpm" +#include "gui/mplayer/pixmaps/empty1px.xpm" #endif #ifdef CONFIG_VCD -#include "../pixmaps/vcd.xpm" -#include "../pixmaps/playvcd.xpm" +#include "gui/mplayer/pixmaps/vcd.xpm" +#include "gui/mplayer/pixmaps/playvcd.xpm" #endif void ActivateMenuItem( int Item ) diff --git a/stream/librtsp/rtsp_rtp.c b/stream/librtsp/rtsp_rtp.c index 8b3d08ba78..fd01524d89 100644 --- a/stream/librtsp/rtsp_rtp.c +++ b/stream/librtsp/rtsp_rtp.c @@ -42,8 +42,8 @@ #include "rtsp.h" #include "rtsp_rtp.h" #include "rtsp_session.h" -#include "../freesdp/common.h" -#include "../freesdp/parser.h" +#include "stream/freesdp/common.h" +#include "stream/freesdp/parser.h" #define RTSP_DEFAULT_PORT 31336 #define MAX_LENGTH 256 diff --git a/stream/librtsp/rtsp_session.c b/stream/librtsp/rtsp_session.c index eab6ae7ba7..5e897ba777 100644 --- a/stream/librtsp/rtsp_session.c +++ b/stream/librtsp/rtsp_session.c @@ -48,15 +48,15 @@ #include #include "mp_msg.h" -#include "../url.h" -#include "../rtp.h" #include "rtsp.h" #include "rtsp_rtp.h" #include "rtsp_session.h" -#include "../realrtsp/real.h" -#include "../realrtsp/rmff.h" -#include "../realrtsp/asmrp.h" -#include "../realrtsp/xbuffer.h" +#include "stream/url.h" +#include "stream/rtp.h" +#include "stream/realrtsp/real.h" +#include "stream/realrtsp/rmff.h" +#include "stream/realrtsp/asmrp.h" +#include "stream/realrtsp/xbuffer.h" /* #define LOG diff --git a/stream/realrtsp/real.c b/stream/realrtsp/real.c index 62670f4726..6a7ef4e47b 100644 --- a/stream/realrtsp/real.c +++ b/stream/realrtsp/real.c @@ -38,7 +38,7 @@ #include "xbuffer.h" #include "libavutil/md5.h" #include "libavutil/intreadwrite.h" -#include "../http.h" +#include "stream/http.h" #include "mp_msg.h" /* diff --git a/stream/realrtsp/real.h b/stream/realrtsp/real.h index 37ac03b28e..0569a3db74 100644 --- a/stream/realrtsp/real.h +++ b/stream/realrtsp/real.h @@ -31,7 +31,7 @@ #define MPLAYER_REAL_H #include "rmff.h" -#include "../librtsp/rtsp.h" +#include "stream/librtsp/rtsp.h" #define HEADER_SIZE 4096 diff --git a/stream/realrtsp/sdpplin.c b/stream/realrtsp/sdpplin.c index 31514befeb..80dc49edaa 100644 --- a/stream/realrtsp/sdpplin.c +++ b/stream/realrtsp/sdpplin.c @@ -27,7 +27,7 @@ */ #include "config.h" -#include "../librtsp/rtsp.h" +#include "stream/librtsp/rtsp.h" #include "sdpplin.h" #include "xbuffer.h" #include "mp_msg.h" diff --git a/stream/realrtsp/sdpplin.h b/stream/realrtsp/sdpplin.h index ff79c49775..658aeaf0ed 100644 --- a/stream/realrtsp/sdpplin.h +++ b/stream/realrtsp/sdpplin.h @@ -30,7 +30,7 @@ #define MPLAYER_SDPPLIN_H #include "rmff.h" -#include "../librtsp/rtsp.h" +#include "stream/librtsp/rtsp.h" typedef struct { -- cgit v1.2.3