diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-05 00:44:49 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-05 00:44:49 +0100 |
| commit | c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af (patch) | |
| tree | b39027bf19757a904f9d306085d8744046f24a1f /include/xine/audio_decoder.h | |
| parent | 119076c9300e2e2a816dc1a6ca32ba77f338b20c (diff) | |
| parent | a2a95425350da93551388acdca8a00818a34c317 (diff) | |
| download | xine-lib-c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af.tar.gz xine-lib-c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af.tar.bz2 | |
Merge from 1.2.
Diffstat (limited to 'include/xine/audio_decoder.h')
| -rw-r--r-- | include/xine/audio_decoder.h | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/include/xine/audio_decoder.h b/include/xine/audio_decoder.h index 307692b81..49194e290 100644 --- a/include/xine/audio_decoder.h +++ b/include/xine/audio_decoder.h @@ -23,12 +23,11 @@ #ifndef HAVE_AUDIO_DECODER_H #define HAVE_AUDIO_DECODER_H +#include <xine/os_types.h> +#include <xine/buffer.h> + #ifdef XINE_COMPILE -# include <inttypes.h> -# include "buffer.h" -#else -# include <xine/os_types.h> -# include <xine/buffer.h> +# include <xine/plugin_catalog.h> #endif #define AUDIO_DECODER_IFACE_VERSION 16 @@ -98,8 +97,17 @@ struct audio_decoder_s { */ void (*dispose) (audio_decoder_t *this); - void *node; /* used by plugin loader */ - + /** + * @brief Pointer to the loaded plugin node. + * + * Used by the plugins loader. It's an opaque type when using the + * structure outside of xine's build. + */ +#ifdef XINE_COMPILE + plugin_node_t *node; +#else + void *node; +#endif }; #endif |