diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/xine.h | 4 | ||||
| -rw-r--r-- | include/xine/demux.h | 12 | ||||
| -rw-r--r-- | include/xine/xine_internal.h | 57 |
3 files changed, 23 insertions, 50 deletions
diff --git a/include/xine.h b/include/xine.h index 4eaccf96c..da1d394a3 100644 --- a/include/xine.h +++ b/include/xine.h @@ -57,11 +57,11 @@ extern "C" { #ifdef XINE_COMPILE #include <inttypes.h> -#include "attributes.h" #else #include <xine/os_types.h> -#include <xine/attributes.h> #endif + +#include <xine/attributes.h> #include <xine/version.h> /* This enables some experimental features. These are not part of the diff --git a/include/xine/demux.h b/include/xine/demux.h index ee5ca42f0..476c80b8e 100644 --- a/include/xine/demux.h +++ b/include/xine/demux.h @@ -21,15 +21,9 @@ #ifndef HAVE_DEMUX_H #define HAVE_DEMUX_H -#ifdef XINE_COMPILE -# include "input/input_plugin.h" -# include "buffer.h" -# include "xine_internal.h" -#else -# include <xine/input_plugin.h> -# include <xine/buffer.h> -# include <xine/xine_internal.h> -#endif +#include <xine/input_plugin.h> +#include <xine/buffer.h> +#include <xine/xine_internal.h> #define DEMUXER_PLUGIN_IFACE_VERSION 27 diff --git a/include/xine/xine_internal.h b/include/xine/xine_internal.h index 13b003992..20bf6a9c8 100644 --- a/include/xine/xine_internal.h +++ b/include/xine/xine_internal.h @@ -29,45 +29,24 @@ extern "C" { * include public part of xine header */ -#ifdef XINE_COMPILE -# include "xine.h" -# include "refcounter.h" -# include "input/input_plugin.h" -# include "demuxers/demux.h" -# include "video_out.h" -# include "audio_out.h" -# include "metronom.h" -# include "osd.h" -# include "xineintl.h" -# include "plugin_catalog.h" -# include "video_decoder.h" -# include "audio_decoder.h" -# include "spu_decoder.h" -# include "scratch.h" -# include "broadcaster.h" -# include "io_helper.h" -# include "info_helper.h" -# include "alphablend.h" -#else -# include <xine.h> -# include <xine/refcounter.h> -# include <xine/input_plugin.h> -# include <xine/demux.h> -# include <xine/video_out.h> -# include <xine/audio_out.h> -# include <xine/metronom.h> -# include <xine/osd.h> -# include <xine/xineintl.h> -# include <xine/plugin_catalog.h> -# include <xine/video_decoder.h> -# include <xine/audio_decoder.h> -# include <xine/spu_decoder.h> -# include <xine/scratch.h> -# include <xine/broadcaster.h> -# include <xine/io_helper.h> -# include <xine/info_helper.h> -# include <xine/alphablend.h> -#endif +#include <xine.h> +#include <xine/refcounter.h> +#include <xine/input_plugin.h> +#include <xine/demux.h> +#include <xine/video_out.h> +#include <xine/audio_out.h> +#include <xine/metronom.h> +#include <xine/osd.h> +#include <xine/xineintl.h> +#include <xine/plugin_catalog.h> +#include <xine/video_decoder.h> +#include <xine/audio_decoder.h> +#include <xine/spu_decoder.h> +#include <xine/scratch.h> +#include <xine/broadcaster.h> +#include <xine/io_helper.h> +#include <xine/info_helper.h> +#include <xine/alphablend.h> #define XINE_MAX_EVENT_LISTENERS 50 #define XINE_MAX_EVENT_TYPES 100 |