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/demux.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/demux.h')
-rw-r--r-- | include/xine/demux.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/include/xine/demux.h b/include/xine/demux.h index 476c80b8e..35a5c9a82 100644 --- a/include/xine/demux.h +++ b/include/xine/demux.h @@ -25,6 +25,10 @@ #include <xine/buffer.h> #include <xine/xine_internal.h> +#ifdef XINE_COMPILE +# include <xine/plugin_catalog.h> +#endif + #define DEMUXER_PLUGIN_IFACE_VERSION 27 #define DEMUX_OK 0 @@ -169,8 +173,17 @@ struct demux_plugin_s { demux_class_t *demux_class; - 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 } ; #define default_demux_plugin_dispose (void (*) (demux_plugin_t *this))free |