vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Mon May 30 17:58:28 2011 +0300| [13700a227ef6c45cd19d6c9b068726a41b03f285] | committer: Rémi Denis-Courmont
Do not #include <vlc_aout_mixer.h> from <vlc_aout.h> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=13700a227ef6c45cd19d6c9b068726a41b03f285 --- include/vlc_aout.h | 5 +++-- modules/audio_mixer/float32.c | 1 + modules/audio_mixer/spdif.c | 1 + modules/audio_mixer/trivial.c | 1 + src/audio_output/aout_internal.h | 2 ++ 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/vlc_aout.h b/include/vlc_aout.h index 7139d43..a10f5de 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 b680484..435872f 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 0bd545f..5accc7e 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 0943710..7c1f8bf 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 fb87f52..968805e 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); _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
