Author: diego Date: Sat Aug 30 00:29:27 2008 New Revision: 27495 Log: consistency cosmetics: Avoid using .. in #include paths. Modified: trunk/gui/mplayer/gtk/mb.c trunk/gui/mplayer/gtk/menu.c trunk/stream/librtsp/rtsp_rtp.c trunk/stream/librtsp/rtsp_session.c trunk/stream/realrtsp/real.c trunk/stream/realrtsp/real.h trunk/stream/realrtsp/sdpplin.c trunk/stream/realrtsp/sdpplin.h Modified: trunk/gui/mplayer/gtk/mb.c ============================================================================== --- trunk/gui/mplayer/gtk/mb.c (original) +++ trunk/gui/mplayer/gtk/mb.c Sat Aug 30 00:29:27 2008 @@ -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" Modified: trunk/gui/mplayer/gtk/menu.c ============================================================================== --- trunk/gui/mplayer/gtk/menu.c (original) +++ trunk/gui/mplayer/gtk/menu.c Sat Aug 30 00:29:27 2008 @@ -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 ) Modified: trunk/stream/librtsp/rtsp_rtp.c ============================================================================== --- trunk/stream/librtsp/rtsp_rtp.c (original) +++ trunk/stream/librtsp/rtsp_rtp.c Sat Aug 30 00:29:27 2008 @@ -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 Modified: trunk/stream/librtsp/rtsp_session.c ============================================================================== --- trunk/stream/librtsp/rtsp_session.c (original) +++ trunk/stream/librtsp/rtsp_session.c Sat Aug 30 00:29:27 2008 @@ -48,15 +48,15 @@ #include <inttypes.h> #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 Modified: trunk/stream/realrtsp/real.c ============================================================================== --- trunk/stream/realrtsp/real.c (original) +++ trunk/stream/realrtsp/real.c Sat Aug 30 00:29:27 2008 @@ -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" /* Modified: trunk/stream/realrtsp/real.h ============================================================================== --- trunk/stream/realrtsp/real.h (original) +++ trunk/stream/realrtsp/real.h Sat Aug 30 00:29:27 2008 @@ -31,7 +31,7 @@ #define MPLAYER_REAL_H #include "rmff.h" -#include "../librtsp/rtsp.h" +#include "stream/librtsp/rtsp.h" #define HEADER_SIZE 4096 Modified: trunk/stream/realrtsp/sdpplin.c ============================================================================== --- trunk/stream/realrtsp/sdpplin.c (original) +++ trunk/stream/realrtsp/sdpplin.c Sat Aug 30 00:29:27 2008 @@ -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" Modified: trunk/stream/realrtsp/sdpplin.h ============================================================================== --- trunk/stream/realrtsp/sdpplin.h (original) +++ trunk/stream/realrtsp/sdpplin.h Sat Aug 30 00:29:27 2008 @@ -30,7 +30,7 @@ #define MPLAYER_SDPPLIN_H #include "rmff.h" -#include "../librtsp/rtsp.h" +#include "stream/librtsp/rtsp.h" typedef struct {