diff options
Diffstat (limited to 'src/xine-engine')
29 files changed, 89 insertions, 93 deletions
diff --git a/src/xine-engine/alphablend.c b/src/xine-engine/alphablend.c index 4dffa09ad..c47257273 100644 --- a/src/xine-engine/alphablend.c +++ b/src/xine-engine/alphablend.c @@ -32,9 +32,9 @@ #include <stdlib.h> #include <stdio.h> -#include "xine_internal.h" -#include "video_out.h" -#include "alphablend.h" +#include <xine/xine_internal.h> +#include <xine/video_out.h> +#include <xine/alphablend.h> #include "bswap.h" diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c index 5476262d9..6a0688f0d 100644 --- a/src/xine-engine/audio_decoder.c +++ b/src/xine-engine/audio_decoder.c @@ -39,8 +39,8 @@ #define LOG */ -#include "xine_internal.h" -#include "xineutils.h" +#include <xine/xine_internal.h> +#include <xine/xineutils.h> static void *audio_decoder_loop (void *stream_gen) { diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index aac1739aa..39e3cd1a4 100644 --- a/src/xine-engine/audio_out.c +++ b/src/xine-engine/audio_out.c @@ -89,11 +89,11 @@ #define LOG_RESAMPLE_SYNC 0 -#include "xine_internal.h" -#include "xineutils.h" -#include "audio_out.h" -#include "resample.h" -#include "metronom.h" +#include <xine/xine_internal.h> +#include <xine/xineutils.h> +#include <xine/audio_out.h> +#include <xine/resample.h> +#include <xine/metronom.h> #define NUM_AUDIO_BUFFERS 32 diff --git a/src/xine-engine/broadcaster.c b/src/xine-engine/broadcaster.c index ce7494c1d..71d466c3a 100644 --- a/src/xine-engine/broadcaster.c +++ b/src/xine-engine/broadcaster.c @@ -57,9 +57,9 @@ #include <dlfcn.h> #include <pthread.h> -#include "xine_internal.h" -#include "buffer.h" -#include "xineutils.h" +#include <xine/xine_internal.h> +#include <xine/buffer.h> +#include <xine/xineutils.h> #define QLEN 5 /* maximum connection queue length */ #define _BUFSIZ 512 diff --git a/src/xine-engine/buffer.c b/src/xine-engine/buffer.c index 93ad75ba0..8b8a8334a 100644 --- a/src/xine-engine/buffer.c +++ b/src/xine-engine/buffer.c @@ -43,9 +43,9 @@ #define LOG */ -#include "buffer.h" -#include "xineutils.h" -#include "xine_internal.h" +#include <xine/buffer.h> +#include <xine/xineutils.h> +#include <xine/xine_internal.h> /* * put a previously allocated buffer element back into the buffer pool diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index eece2df90..08ff194fa 100644 --- a/src/xine-engine/buffer_types.c +++ b/src/xine-engine/buffer_types.c @@ -32,7 +32,7 @@ #include <string.h> #include <stdlib.h> #include <inttypes.h> -#include "buffer.h" +#include <xine/buffer.h> #include "bswap.h" typedef struct video_db_s { diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c index 2f5e6214a..47b77b03e 100644 --- a/src/xine-engine/configfile.c +++ b/src/xine-engine/configfile.c @@ -31,7 +31,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#include "configfile.h" +#include <xine/configfile.h> #define LOG_MODULE "configfile" #define LOG_VERBOSE @@ -39,8 +39,8 @@ #define LOG */ -#include "xineutils.h" -#include "xine_internal.h" +#include <xine/xineutils.h> +#include <xine/xine_internal.h> static const xine_config_entry_translation_t *config_entry_translation_user = NULL; static const xine_config_entry_translation_t config_entry_translation[] = { diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c index 5010c60eb..232e0342e 100644 --- a/src/xine-engine/demux.c +++ b/src/xine-engine/demux.c @@ -39,9 +39,9 @@ #define LOG */ -#include "xine_internal.h" -#include "demuxers/demux.h" -#include "buffer.h" +#include <xine/xine_internal.h> +#include <xine/demux.h> +#include <xine/buffer.h> #ifdef WIN32 #include <winsock.h> diff --git a/src/xine-engine/events.c b/src/xine-engine/events.c index f79187682..bf0d88fae 100644 --- a/src/xine-engine/events.c +++ b/src/xine-engine/events.c @@ -26,7 +26,7 @@ #define XINE_ENGINE_INTERNAL -#include "xine_internal.h" +#include <xine/xine_internal.h> xine_event_t *xine_event_get (xine_event_queue_t *queue) { diff --git a/src/xine-engine/info_helper.c b/src/xine-engine/info_helper.c index 1ac4ed982..bc66ba24e 100644 --- a/src/xine-engine/info_helper.c +++ b/src/xine-engine/info_helper.c @@ -35,7 +35,7 @@ #define XINE_ENGINE_INTERNAL -#include "info_helper.h" +#include <xine/info_helper.h> /* ******************* Stream Info *************************** */ diff --git a/src/xine-engine/input_cache.c b/src/xine-engine/input_cache.c index 0535bc8f7..2989d8718 100644 --- a/src/xine-engine/input_cache.c +++ b/src/xine-engine/input_cache.c @@ -33,7 +33,7 @@ #define LOG */ -#include "xine_internal.h" +#include <xine/xine_internal.h> #include <assert.h> #define DEFAULT_BUFFER_SIZE 1024 diff --git a/src/xine-engine/input_rip.c b/src/xine-engine/input_rip.c index a8268552a..e7ef356b3 100644 --- a/src/xine-engine/input_rip.c +++ b/src/xine-engine/input_rip.c @@ -64,7 +64,7 @@ # define CLR_RST "\e[0;39m" #endif -#include "xine_internal.h" +#include <xine/xine_internal.h> #ifndef HAVE_FSEEKO # define fseeko fseek diff --git a/src/xine-engine/io_helper.c b/src/xine-engine/io_helper.c index b51442402..d51feb4c6 100644 --- a/src/xine-engine/io_helper.c +++ b/src/xine-engine/io_helper.c @@ -38,7 +38,7 @@ #define XINE_ENGINE_INTERNAL -#include "io_helper.h" +#include <xine/io_helper.h> /* private constants */ #define XIO_FILE_READ 0 diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index a03ea6d17..7a6237b79 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -51,17 +51,17 @@ #define XINE_ENABLE_EXPERIMENTAL_FEATURES 1 #define XINE_ENGINE_INTERNAL -#include "xine_internal.h" -#include "xine_plugin.h" -#include "plugin_catalog.h" -#include "demuxers/demux.h" -#include "input/input_plugin.h" -#include "video_out.h" -#include "post.h" -#include "metronom.h" -#include "configfile.h" -#include "xineutils.h" -#include "compat.h" +#include <xine/xine_internal.h> +#include <xine/xine_plugin.h> +#include <xine/plugin_catalog.h> +#include <xine/demux.h> +#include <xine/input_plugin.h> +#include <xine/video_out.h> +#include <xine/post.h> +#include <xine/metronom.h> +#include <xine/configfile.h> +#include <xine/xineutils.h> +#include <xine/compat.h> #if 0 diff --git a/src/xine-engine/lrb.c b/src/xine-engine/lrb.c index 6da846a7c..a2fc5d1da 100644 --- a/src/xine-engine/lrb.c +++ b/src/xine-engine/lrb.c @@ -23,7 +23,7 @@ #endif #include "lrb.h" -#include "xineutils.h" +#include <xine/xineutils.h> lrb_t *lrb_new (int max_num_entries, fifo_buffer_t *fifo) { diff --git a/src/xine-engine/lrb.h b/src/xine-engine/lrb.h index 491ae8843..0f524b7eb 100644 --- a/src/xine-engine/lrb.h +++ b/src/xine-engine/lrb.h @@ -24,11 +24,7 @@ #ifndef HAVE_LRB_H #define HAVE_LRB_H -#ifdef XINE_COMPILE -# include "buffer.h" -#else -# include <xine/buffer.h> -#endif +#include <xine/buffer.h> typedef struct { diff --git a/src/xine-engine/metronom.c b/src/xine-engine/metronom.c index e9bd86836..42aed4e76 100644 --- a/src/xine-engine/metronom.c +++ b/src/xine-engine/metronom.c @@ -40,9 +40,9 @@ #define METRONOM_INTERNAL #define METRONOM_CLOCK_INTERNAL -#include "xine_internal.h" -#include "metronom.h" -#include "xineutils.h" +#include <xine/xine_internal.h> +#include <xine/metronom.h> +#include <xine/xineutils.h> #define MAX_AUDIO_DELTA 1600 #define AUDIO_SAMPLE_NUM 32768 diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c index 1587b76e4..39687e83f 100644 --- a/src/xine-engine/osd.c +++ b/src/xine-engine/osd.c @@ -50,11 +50,11 @@ #define XINE_ENGINE_INTERNAL -#include "xine_internal.h" +#include <xine/xine_internal.h> #include "xine-engine/bswap.h" -#include "xineutils.h" -#include "video_out.h" -#include "osd.h" +#include <xine/xineutils.h> +#include <xine/video_out.h> +#include <xine/osd.h> #ifdef HAVE_FT2 #include <ft2build.h> diff --git a/src/xine-engine/post.c b/src/xine-engine/post.c index e54d2234f..e057ff99f 100644 --- a/src/xine-engine/post.c +++ b/src/xine-engine/post.c @@ -25,7 +25,7 @@ #define POST_INTERNAL #define XINE_ENGINE_INTERNAL -#include "post.h" +#include <xine/post.h> #include <stdarg.h> diff --git a/src/xine-engine/refcounter.c b/src/xine-engine/refcounter.c index 539abf3ed..4bb6a0351 100644 --- a/src/xine-engine/refcounter.c +++ b/src/xine-engine/refcounter.c @@ -23,8 +23,8 @@ #define LOG */ -#include "xine_internal.h" -#include "refcounter.h" +#include <xine/xine_internal.h> +#include <xine/refcounter.h> refcounter_t* _x_new_refcounter(void *object, void (*destructor)(void *)) { diff --git a/src/xine-engine/resample.c b/src/xine-engine/resample.c index 43911c401..f907c965e 100644 --- a/src/xine-engine/resample.c +++ b/src/xine-engine/resample.c @@ -24,8 +24,8 @@ #include <string.h> #include <inttypes.h> -#include "attributes.h" -#include "resample.h" +#include <xine/attributes.h> +#include <xine/resample.h> /* contributed by paul flinders */ diff --git a/src/xine-engine/scratch.c b/src/xine-engine/scratch.c index 8f9021aa1..7376a3f9e 100644 --- a/src/xine-engine/scratch.c +++ b/src/xine-engine/scratch.c @@ -33,8 +33,8 @@ #define LOG */ -#include "xineutils.h" -#include "scratch.h" +#include <xine/xineutils.h> +#include <xine/scratch.h> static void __attribute__((__format__(__printf__, 2, 0))) scratch_printf (scratch_buffer_t *this, const char *format, va_list argp) diff --git a/src/xine-engine/spu.c b/src/xine-engine/spu.c index 813300fb0..c610a43c9 100644 --- a/src/xine-engine/spu.c +++ b/src/xine-engine/spu.c @@ -19,8 +19,8 @@ * */ -#include "xine_internal.h" -#include "spu.h" +#include <xine/xine_internal.h> +#include <xine/spu.h> #define BLACK_OPACITY 67 #define COLOUR_OPACITY 100 diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c index c88e01714..ca6e7aa23 100644 --- a/src/xine-engine/video_decoder.c +++ b/src/xine-engine/video_decoder.c @@ -35,8 +35,8 @@ #define LOG */ -#include "xine_internal.h" -#include "xineutils.h" +#include <xine/xine_internal.h> +#include <xine/xineutils.h> #include <sched.h> #define SPU_SLEEP_INTERVAL (90000/2) diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c index 8c9810da1..0bab612ce 100644 --- a/src/xine-engine/video_out.c +++ b/src/xine-engine/video_out.c @@ -44,10 +44,10 @@ #define LOG */ -#include "xine_internal.h" -#include "video_out.h" -#include "metronom.h" -#include "xineutils.h" +#include <xine/xine_internal.h> +#include <xine/video_out.h> +#include <xine/metronom.h> +#include <xine/xineutils.h> #define NUM_FRAME_BUFFERS 15 #define MAX_USEC_TO_SLEEP 20000 diff --git a/src/xine-engine/video_overlay.c b/src/xine-engine/video_overlay.c index c189fa56b..44080c469 100644 --- a/src/xine-engine/video_overlay.c +++ b/src/xine-engine/video_overlay.c @@ -25,11 +25,11 @@ #include <sys/stat.h> #include <fcntl.h> -#include "buffer.h" -#include "xine_internal.h" +#include <xine/buffer.h> +#include <xine/xine_internal.h> #include "bswap.h" -#include "xineutils.h" -#include "video_overlay.h" +#include <xine/xineutils.h> +#include <xine/video_overlay.h> /* #define LOG_DEBUG diff --git a/src/xine-engine/vo_scale.c b/src/xine-engine/vo_scale.c index ff30c47a6..5da5ab26e 100644 --- a/src/xine-engine/vo_scale.c +++ b/src/xine-engine/vo_scale.c @@ -32,8 +32,8 @@ #define LOG */ -#include "xine_internal.h" -#include "vo_scale.h" +#include <xine/xine_internal.h> +#include <xine/vo_scale.h> /* * convert delivered height/width to ideal width/height diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 6d6e05b19..ec2dc9170 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -58,21 +58,21 @@ #define XINE_ENGINE_INTERNAL #define METRONOM_CLOCK_INTERNAL -#include "xine_internal.h" -#include "plugin_catalog.h" -#include "audio_out.h" -#include "video_out.h" -#include "demuxers/demux.h" -#include "buffer.h" -#include "spu_decoder.h" -#include "input/input_plugin.h" -#include "metronom.h" -#include "configfile.h" -#include "osd.h" -#include "spu.h" - -#include "xineutils.h" -#include "compat.h" +#include <xine/xine_internal.h> +#include <xine/plugin_catalog.h> +#include <xine/audio_out.h> +#include <xine/video_out.h> +#include <xine/demux.h> +#include <xine/buffer.h> +#include <xine/spu_decoder.h> +#include <xine/input_plugin.h> +#include <xine/metronom.h> +#include <xine/configfile.h> +#include <xine/osd.h> +#include <xine/spu.h> + +#include <xine/xineutils.h> +#include <xine/compat.h> #ifdef WIN32 # include <fcntl.h> diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c index 7913a18d6..32b8663a6 100644 --- a/src/xine-engine/xine_interface.c +++ b/src/xine-engine/xine_interface.c @@ -40,11 +40,11 @@ #define XINE_ENGINE_INTERNAL -#include "xine_internal.h" -#include "audio_out.h" -#include "video_out.h" -#include "demuxers/demux.h" -#include "post.h" +#include <xine/xine_internal.h> +#include <xine/audio_out.h> +#include <xine/video_out.h> +#include <xine/demux.h> +#include <xine/post.h> /* * version information / checking |