Merge from 1.2.

1 files changed, 13 insertions, 7 deletions

diff --git a/include/xine/audio_out.h b/include/xine/audio_out.h
index bd1b910df..b720110bf 100644
--- a/include/xine/audio_out.h
+++ b/include/xine/audio_out.h
@@ -24,18 +24,14 @@
 extern "C" {
 #endif
 
-#if defined(XINE_COMPILE)
-#include <inttypes.h>
-#include "metronom.h"
-#include "configfile.h"
-#include "xineutils.h"
-#else
 #include <xine/os_types.h>
 #include <xine/metronom.h>
 #include <xine/configfile.h>
 #include <xine/xineutils.h>
-#endif
 
+#ifdef XINE_COMPILE
+#  include <xine/plugin_catalog.h>
+#endif
 
 #define AUDIO_OUT_IFACE_VERSION  9
 
@@ -126,7 +122,17 @@ struct ao_driver_s {
    */
   int (*control) (ao_driver_t *, int cmd, /* arg */ ...);
 
+  /**
+   * @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
 };
 
 typedef struct ao_format_s ao_format_t;