diff --git a/include/vlc_aout_mixer.h b/include/vlc_aout_mixer.h index ad0d12e7282b07050d2707ecaf01863fcdaa7599..b3bf37bb5a3ae1f0c54f0df0ce56760cda291767 100644 --- a/include/vlc_aout_mixer.h +++ b/include/vlc_aout_mixer.h @@ -48,6 +48,10 @@ struct audio_mixer void (*mix)(audio_mixer_t *, block_t *, float); /**< Amplifier */ }; +VLC_API audio_mixer_t *aout_MixerNew(vlc_object_t *, vlc_fourcc_t) VLC_USED; +VLC_API void aout_MixerDelete(audio_mixer_t *); +VLC_API void aout_MixerRun(audio_mixer_t *, block_t *, float); + #ifdef __cplusplus } #endif diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h index 14ade82656b79a5d911cc4e03fab72ee8b7ccbfe..8cfe398065db0fecc84118acb360b0d8c1cc9fa7 100644 --- a/src/audio_output/aout_internal.h +++ b/src/audio_output/aout_internal.h @@ -141,10 +141,8 @@ void aout_FiltersDestroyPipeline( filter_t *const *, unsigned ); void aout_FiltersPlay( filter_t *const *, unsigned, aout_buffer_t ** ); /* From mixer.c : */ -struct audio_mixer *aout_MixerNew(vlc_object_t *, vlc_fourcc_t); #define aout_MixerNew(o, f) aout_MixerNew(VLC_OBJECT(o), f) -void aout_MixerDelete(struct audio_mixer *); -void aout_MixerRun(struct audio_mixer *, block_t *, float); + float aout_ReplayGainSelect(vlc_object_t *, const char *, const audio_replay_gain_t *); #define aout_ReplayGainSelect(o, s, g) \ diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c index 156186a15f646f618f826353de5de63f06a51992..20b5f84f6a71cfd0372eaa4eeb153910352d2772 100644 --- a/src/audio_output/dec.c +++ b/src/audio_output/dec.c @@ -32,6 +32,7 @@ #include <vlc_common.h> #include <vlc_aout.h> +#include <vlc_aout_mixer.h> #include <vlc_input.h> #include <vlc_atomic.h> diff --git a/src/libvlccore.sym b/src/libvlccore.sym index 9dcf07fda1f710f2a562ae5ab22b9e4e492507cb..7f621007b520abd27bf212b9123a6bbac5a3a305 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -17,6 +17,9 @@ aout_filter_RequestVout aout_FormatPrepare aout_FormatPrint aout_FormatPrintChannels +aout_MixerDelete +aout_MixerNew +aout_MixerRun aout_PacketInit aout_PacketDestroy aout_PacketPlay