vlc | branch: master | Ludovic Fauvet <[email protected]> | Wed Mar 28 16:30:51 2012 +0200| [89d0dfc829a28a320d1368dc9b4603721e52a420] | committer: Rémi Denis-Courmont
Export aout_Mixer functions to modules Signed-off-by: Rémi Denis-Courmont <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=89d0dfc829a28a320d1368dc9b4603721e52a420 --- include/vlc_aout_mixer.h | 4 ++++ src/audio_output/aout_internal.h | 4 +--- src/audio_output/dec.c | 1 + src/libvlccore.sym | 3 +++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/vlc_aout_mixer.h b/include/vlc_aout_mixer.h index ad0d12e..b3bf37b 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 14ade82..8cfe398 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 156186a..20b5f84 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 9dcf07f..7f62100 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 _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
