Merge from 1.2.

1 files changed, 15 insertions, 6 deletions

diff --git a/include/xine/spu_decoder.h b/include/xine/spu_decoder.h
index dcf9107f7..d36b5b691 100644
--- a/include/xine/spu_decoder.h
+++ b/include/xine/spu_decoder.h
@@ -24,12 +24,11 @@
 #ifndef HAVE_SPU_API_H
 #define HAVE_SPU_API_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 SPU_DECODER_IFACE_VERSION 17
@@ -118,7 +117,17 @@ struct spu_decoder_s {
    */
   void (*set_button) (spu_decoder_t *this_gen, int32_t button, int32_t mode);
 
-  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
 };