From: Rémi Denis-Courmont <remi@remlab.net>
Date: Mon, 30 May 2011 14:58:28 +0000 (+0300)
Subject: Do not #include <vlc_aout_mixer.h> from <vlc_aout.h>
X-Git-Tag: 1.2.0-pre1~2430
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=13700a227ef6c45cd19d6c9b068726a41b03f285;p=vlc

Do not #include <vlc_aout_mixer.h> from <vlc_aout.h>
---

diff --git a/include/vlc_aout.h b/include/vlc_aout.h
index 7139d4328e..a10f5de925 100644
--- a/include/vlc_aout.h
+++ b/include/vlc_aout.h
@@ -150,7 +150,6 @@ struct aout_fifo_t
 };
 
 /* FIXME to remove once aout.h is cleaned a bit more */
-#include <vlc_aout_mixer.h>
 #include <vlc_block.h>
 
 /** audio output filter */
@@ -205,6 +204,8 @@ typedef struct aout_output_t
     bool              b_error;
 } aout_output_t;
 
+struct aout_mixer_t;
+
 /** audio output thread descriptor */
 struct aout_instance_t
 {
@@ -235,7 +236,7 @@ struct aout_instance_t
     audio_sample_format_t   mixer_format;
     aout_alloc_t            mixer_allocation;
     float                   mixer_multiplier;
-    aout_mixer_t            *p_mixer;
+    struct aout_mixer_t    *p_mixer;
 
     /* Output plug-in */
     aout_output_t           output;
diff --git a/modules/audio_mixer/float32.c b/modules/audio_mixer/float32.c
index b68048491b..435872f199 100644
--- a/modules/audio_mixer/float32.c
+++ b/modules/audio_mixer/float32.c
@@ -33,6 +33,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
+#include <vlc_aout_mixer.h>
 
 /*****************************************************************************
  * Local prototypes
diff --git a/modules/audio_mixer/spdif.c b/modules/audio_mixer/spdif.c
index 0bd545f728..5accc7e186 100644
--- a/modules/audio_mixer/spdif.c
+++ b/modules/audio_mixer/spdif.c
@@ -34,6 +34,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
+#include <vlc_aout_mixer.h>
 
 /*****************************************************************************
  * Local prototypes
diff --git a/modules/audio_mixer/trivial.c b/modules/audio_mixer/trivial.c
index 09437102eb..7c1f8bf67f 100644
--- a/modules/audio_mixer/trivial.c
+++ b/modules/audio_mixer/trivial.c
@@ -33,6 +33,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_aout.h>
+#include <vlc_aout_mixer.h>
 
 /*****************************************************************************
  * Local prototypes
diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h
index fb87f523db..968805e7c1 100644
--- a/src/audio_output/aout_internal.h
+++ b/src/audio_output/aout_internal.h
@@ -24,6 +24,8 @@
 #ifndef LIBVLC_AOUT_INTERNAL_H
 # define LIBVLC_AOUT_INTERNAL_H 1
 
+# include <vlc_aout_mixer.h>
+
 aout_buffer_t *aout_BufferAlloc(aout_alloc_t *allocation, mtime_t microseconds,
         aout_buffer_t *old_buffer);