diff options
Diffstat (limited to 'src/video_out')
27 files changed, 78 insertions, 82 deletions
diff --git a/src/video_out/macosx/XineOpenGLView.m b/src/video_out/macosx/XineOpenGLView.m index a9ffee00f..5ed515704 100644 --- a/src/video_out/macosx/XineOpenGLView.m +++ b/src/video_out/macosx/XineOpenGLView.m @@ -30,11 +30,7 @@ #import "XineOpenGLView.h" -#ifdef XINE_COMPILE -# include "xineutils.h" -#else -# include <xine/xineutils.h> -#endif +#include <xine/xineutils.h> NSString *XineViewDidResizeNotification EXPORTED = @"XineViewDidResizeNotification"; diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c index bcbe2477e..ff9abd320 100644 --- a/src/video_out/video_out_aa.c +++ b/src/video_out/video_out_aa.c @@ -38,9 +38,9 @@ #include <aalib.h> #include "xine.h" -#include "video_out.h" -#include "xine_internal.h" -#include "xineutils.h" +#include <xine/video_out.h> +#include <xine/xine_internal.h> +#include <xine/xineutils.h> /* * global variables diff --git a/src/video_out/video_out_caca.c b/src/video_out/video_out_caca.c index 231befcdb..6b9f3756e 100644 --- a/src/video_out/video_out_caca.c +++ b/src/video_out/video_out_caca.c @@ -38,10 +38,10 @@ #include <caca.h> #include "xine.h" -#include "video_out.h" -#include "xine_internal.h" +#include <xine/video_out.h> +#include <xine/xine_internal.h> #include "yuv2rgb.h" -#include "xineutils.h" +#include <xine/xineutils.h> /* * structures diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c index 3445be127..39a7917ba 100644 --- a/src/video_out/video_out_directfb.c +++ b/src/video_out/video_out_directfb.c @@ -39,10 +39,10 @@ #define LOG_VERBOSE #include "xine.h" -#include "xine_internal.h" -#include "video_out.h" -#include "xineutils.h" -#include "vo_scale.h" +#include <xine/xine_internal.h> +#include <xine/video_out.h> +#include <xine/xineutils.h> +#include <xine/vo_scale.h> #ifdef DIRECTFB_X11 # include "x11osd.h" diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c index b70709856..c2b3aa101 100644 --- a/src/video_out/video_out_directx.c +++ b/src/video_out/video_out_directx.c @@ -35,10 +35,10 @@ typedef unsigned char boolean; */ #include "xine.h" -#include "video_out.h" -#include "xine_internal.h" +#include <xine/video_out.h> +#include <xine/xine_internal.h> -#include "xine_internal.h" +#include <xine/xine_internal.h> #include "yuv2rgb.h" #define NEW_YUV 1 diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c index 859959455..4914548a1 100644 --- a/src/video_out/video_out_fb.c +++ b/src/video_out/video_out_fb.c @@ -55,7 +55,7 @@ #include <fcntl.h> #include "xine.h" -#include "video_out.h" +#include <xine/video_out.h> #include <errno.h> @@ -78,10 +78,10 @@ #define LOG */ -#include "xine_internal.h" +#include <xine/xine_internal.h> #include "yuv2rgb.h" -#include "xineutils.h" -#include "vo_scale.h" +#include <xine/xineutils.h> +#include <xine/vo_scale.h> typedef struct fb_frame_s { diff --git a/src/video_out/video_out_none.c b/src/video_out/video_out_none.c index c28b0334e..c23c828a6 100644 --- a/src/video_out/video_out_none.c +++ b/src/video_out/video_out_none.c @@ -33,10 +33,10 @@ #include "xine.h" -#include "video_out.h" -#include "xine_internal.h" -#include "xineutils.h" -#include "vo_scale.h" +#include <xine/video_out.h> +#include <xine/xine_internal.h> +#include <xine/xineutils.h> +#include <xine/vo_scale.h> typedef struct { vo_frame_t vo_frame; diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index 04413eb80..466aeda27 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.c @@ -88,11 +88,11 @@ #endif #include "xine.h" -#include "video_out.h" +#include <xine/video_out.h> -#include "xine_internal.h" +#include <xine/xine_internal.h> #include "yuv2rgb.h" -#include "xineutils.h" +#include <xine/xineutils.h> #include "x11osd.h" diff --git a/src/video_out/video_out_pgx32.c b/src/video_out/video_out_pgx32.c index 505a257ce..884f9939f 100644 --- a/src/video_out/video_out_pgx32.c +++ b/src/video_out/video_out_pgx32.c @@ -41,10 +41,10 @@ #include <X11/Xatom.h> #include <dga/dga.h> -#include "xine_internal.h" +#include <xine/xine_internal.h> #include "bswap.h" -#include "vo_scale.h" -#include "xineutils.h" +#include <xine/vo_scale.h> +#include <xine/xineutils.h> /* gfxp register defines */ diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c index 21dcdfb09..d0e74b1e3 100644 --- a/src/video_out/video_out_pgx64.c +++ b/src/video_out/video_out_pgx64.c @@ -43,10 +43,10 @@ #include <X11/Xatom.h> #include <dga/dga.h> -#include "xine_internal.h" +#include <xine/xine_internal.h> #include "bswap.h" -#include "vo_scale.h" -#include "xineutils.h" +#include <xine/vo_scale.h> +#include <xine/xineutils.h> /* * The maximum number of frames that can be used in multi-buffering diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c index 6ee6b19bd..5866f822f 100644 --- a/src/video_out/video_out_sdl.c +++ b/src/video_out/video_out_sdl.c @@ -59,10 +59,10 @@ */ #include "xine.h" -#include "xine_internal.h" -#include "video_out.h" -#include "xineutils.h" -#include "vo_scale.h" +#include <xine/xine_internal.h> +#include <xine/video_out.h> +#include <xine/xineutils.h> +#include <xine/vo_scale.h> #ifdef HAVE_X11 #include <X11/Xlib.h> diff --git a/src/video_out/video_out_stk.c b/src/video_out/video_out_stk.c index 45e9900fd..ba4687b08 100644 --- a/src/video_out/video_out_stk.c +++ b/src/video_out/video_out_stk.c @@ -59,10 +59,10 @@ */ #include "xine.h" -#include "xine_internal.h" -#include "video_out.h" -#include "xineutils.h" -#include "vo_scale.h" +#include <xine/xine_internal.h> +#include <xine/video_out.h> +#include <xine/xineutils.h> +#include <xine/vo_scale.h> /* Extend the video frame class with stk private data */ typedef struct stk_frame_s { diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c index 013695c46..e6c3ffdf6 100644 --- a/src/video_out/video_out_syncfb.c +++ b/src/video_out/video_out_syncfb.c @@ -52,10 +52,10 @@ #include "video_out_syncfb.h" #include "xine.h" -#include "video_out.h" -#include "xine_internal.h" -#include "xineutils.h" -#include "vo_scale.h" +#include <xine/video_out.h> +#include <xine/xine_internal.h> +#include <xine/xineutils.h> +#include <xine/vo_scale.h> /*#define DEBUG_OUTPUT*/ diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c index 3228bbdbb..251dac87e 100644 --- a/src/video_out/video_out_vidix.c +++ b/src/video_out/video_out_vidix.c @@ -57,10 +57,10 @@ #define LOG */ -#include "video_out.h" -#include "xine_internal.h" -#include "xineutils.h" -#include "vo_scale.h" +#include <xine/video_out.h> +#include <xine/xine_internal.h> +#include <xine/xineutils.h> +#include <xine/vo_scale.h> #ifdef HAVE_X11 #include "x11osd.h" diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c index c6ad9e2f1..9e9df7a71 100644 --- a/src/video_out/video_out_xcbshm.c +++ b/src/video_out/video_out_xcbshm.c @@ -37,7 +37,7 @@ #include <math.h> #include "xine.h" -#include "video_out.h" +#include <xine/video_out.h> #include <errno.h> @@ -56,10 +56,10 @@ #define LOG */ -#include "xine_internal.h" +#include <xine/xine_internal.h> #include "yuv2rgb.h" -#include "xineutils.h" -#include "vo_scale.h" +#include <xine/xineutils.h> +#include <xine/vo_scale.h> #include "xcbosd.h" typedef struct { diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c index 1b59f5691..dff973317 100644 --- a/src/video_out/video_out_xcbxv.c +++ b/src/video_out/video_out_xcbxv.c @@ -58,11 +58,11 @@ */ #include "xine.h" -#include "video_out.h" -#include "xine_internal.h" +#include <xine/video_out.h> +#include <xine/xine_internal.h> /* #include "overlay.h" */ -#include "xineutils.h" -#include "vo_scale.h" +#include <xine/xineutils.h> +#include <xine/vo_scale.h> #include "xcbosd.h" typedef struct xv_driver_s xv_driver_t; diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index ddcdb677c..52468781a 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.c @@ -35,7 +35,7 @@ #include <math.h> #include "xine.h" -#include "video_out.h" +#include <xine/video_out.h> #include <X11/Xlib.h> #include <X11/Xutil.h> @@ -57,10 +57,10 @@ #define LOG */ -#include "xine_internal.h" +#include <xine/xine_internal.h> #include "yuv2rgb.h" -#include "xineutils.h" -#include "vo_scale.h" +#include <xine/xineutils.h> +#include <xine/vo_scale.h> #include "x11osd.h" #define LOCK_DISPLAY(this) {if(this->lock_display) this->lock_display(this->user_data); \ diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index ab5410ac3..10e13ab3c 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.c @@ -63,11 +63,11 @@ */ #include "xine.h" -#include "video_out.h" -#include "xine_internal.h" +#include <xine/video_out.h> +#include <xine/xine_internal.h> /* #include "overlay.h" */ -#include "xineutils.h" -#include "vo_scale.h" +#include <xine/xineutils.h> +#include <xine/vo_scale.h> #include "x11osd.h" #define LOCK_DISPLAY(this) {if(this->lock_display) this->lock_display(this->user_data); \ diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c index 2c913dc0e..91db684da 100644 --- a/src/video_out/video_out_xvmc.c +++ b/src/video_out/video_out_xvmc.c @@ -66,12 +66,12 @@ */ #include "xine.h" -#include "video_out.h" -#include "xine_internal.h" +#include <xine/video_out.h> +#include <xine/xine_internal.h> #include "accel_xvmc.h" -#include "xineutils.h" -#include "vo_scale.h" +#include <xine/xineutils.h> +#include <xine/vo_scale.h> /* #define LOG1 */ /* #define DLOG */ diff --git a/src/video_out/x11osd.c b/src/video_out/x11osd.c index e0cb6f1f6..450812f90 100644 --- a/src/video_out/x11osd.c +++ b/src/video_out/x11osd.c @@ -51,7 +51,7 @@ #define LOG */ -#include "xine_internal.h" +#include <xine/xine_internal.h> #include "x11osd.h" struct x11osd diff --git a/src/video_out/x11osd.h b/src/video_out/x11osd.h index fe0bf6208..0ffd6fba6 100644 --- a/src/video_out/x11osd.h +++ b/src/video_out/x11osd.h @@ -28,7 +28,7 @@ #ifndef X11OSD_H #define X11OSD_H -#include "vo_scale.h" +#include <xine/vo_scale.h> typedef struct x11osd x11osd; enum x11osd_mode {X11OSD_SHAPED, X11OSD_COLORKEY}; diff --git a/src/video_out/xcbosd.c b/src/video_out/xcbosd.c index 4bb2b60af..8bb96be1e 100644 --- a/src/video_out/xcbosd.c +++ b/src/video_out/xcbosd.c @@ -49,7 +49,7 @@ #define LOG */ -#include "xine_internal.h" +#include <xine/xine_internal.h> #include "xcbosd.h" struct xcbosd diff --git a/src/video_out/xcbosd.h b/src/video_out/xcbosd.h index 32af4965e..1d4fd1c3a 100644 --- a/src/video_out/xcbosd.h +++ b/src/video_out/xcbosd.h @@ -29,7 +29,7 @@ #ifndef XCBOSD_H #define XCBOSD_H -#include "vo_scale.h" +#include <xine/vo_scale.h> typedef struct xcbosd xcbosd; enum xcbosd_mode {XCBOSD_SHAPED, XCBOSD_COLORKEY}; diff --git a/src/video_out/xxmc.h b/src/video_out/xxmc.h index 84964af17..d6cd7e514 100644 --- a/src/video_out/xxmc.h +++ b/src/video_out/xxmc.h @@ -83,9 +83,9 @@ */ #include "xine.h" -#include "video_out.h" -#include "xine_internal.h" -#include "xineutils.h" +#include <xine/video_out.h> +#include <xine/xine_internal.h> +#include <xine/xineutils.h> #include "vo_scale.h" #include "x11osd.h" #include "accel_xvmc.h" diff --git a/src/video_out/yuv2rgb.c b/src/video_out/yuv2rgb.c index 0ca6537a7..f1ad4dba8 100644 --- a/src/video_out/yuv2rgb.c +++ b/src/video_out/yuv2rgb.c @@ -39,7 +39,7 @@ #define LOG */ -#include "xineutils.h" +#include <xine/xineutils.h> static int prof_scale_line = -1; diff --git a/src/video_out/yuv2rgb_mlib.c b/src/video_out/yuv2rgb_mlib.c index 8635526ed..794ce437e 100644 --- a/src/video_out/yuv2rgb_mlib.c +++ b/src/video_out/yuv2rgb_mlib.c @@ -34,8 +34,8 @@ #include <mlib_algebra.h> #include <mlib_video.h> -#include "attributes.h" -#include "xineutils.h" +#include <xine/attributes.h> +#include <xine/xineutils.h> #include "yuv2rgb.h" #define MIN(a, b) (((a) < (b)) ? (a) : (b)) diff --git a/src/video_out/yuv2rgb_mmx.c b/src/video_out/yuv2rgb_mmx.c index 20a9b5a00..1835efe68 100644 --- a/src/video_out/yuv2rgb_mmx.c +++ b/src/video_out/yuv2rgb_mmx.c @@ -32,7 +32,7 @@ #include <inttypes.h> #include "yuv2rgb.h" -#include "xineutils.h" +#include <xine/xineutils.h> #define CPU_MMXEXT 0 #define CPU_MMX 1 |