From a3ded7d74f5e8bb08f4fc25ff75ca6b534c633dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Sun, 23 Dec 2007 18:44:29 +0100
Subject: Remove XINE_COMPILE conditionals where they just changed the include
 directive paths.

---
 include/xine/audio_out.h | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'include/xine/audio_out.h')

diff --git a/include/xine/audio_out.h b/include/xine/audio_out.h
index bd1b910df..8f73bbbf7 100644
--- a/include/xine/audio_out.h
+++ b/include/xine/audio_out.h
@@ -24,18 +24,10 @@
 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
-
 
 #define AUDIO_OUT_IFACE_VERSION  9
 
-- 
cgit v1.2.3


From 057be3a11b092f1a1333e62945060cbb5c7ee59e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Sun, 23 Dec 2007 18:54:49 +0100
Subject: Make the node pointer transparent during xine build.

Check XINE_COMPILE definition, if it's present, define node as a plugin_node_t pointer rather than a void pointer.
---
 include/xine/audio_out.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'include/xine/audio_out.h')

diff --git a/include/xine/audio_out.h b/include/xine/audio_out.h
index 8f73bbbf7..b720110bf 100644
--- a/include/xine/audio_out.h
+++ b/include/xine/audio_out.h
@@ -29,6 +29,10 @@ extern "C" {
 #include <xine/configfile.h>
 #include <xine/xineutils.h>
 
+#ifdef XINE_COMPILE
+#  include <xine/plugin_catalog.h>
+#endif
+
 #define AUDIO_OUT_IFACE_VERSION  9
 
 /*
@@ -118,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;
-- 
cgit v1.2.3