VLC_COMMON_MEMBERS
module_t *module; /**< Module handle */
- const audio_sample_format_t *fmt; /**< Audio format */
+ vlc_fourcc_t format; /**< Audio samples format */
void (*mix)(audio_mixer_t *, block_t *, float); /**< Amplifier */
};
{
audio_mixer_t *mixer = (audio_mixer_t *)obj;
- switch (mixer->fmt->i_format)
+ switch (mixer->format)
{
case VLC_CODEC_FI32:
mixer->mix = FilterFI32;
{
audio_mixer_t *p_mixer = (audio_mixer_t *)p_this;
- if ( p_mixer->fmt->i_format != VLC_CODEC_FL32 )
+ if (p_mixer->format != VLC_CODEC_FL32)
return -1;
p_mixer->mix = DoWork;
void aout_FiltersPlay( filter_t *const *, unsigned, aout_buffer_t ** );
/* From mixer.c : */
-struct audio_mixer *aout_MixerNew(vlc_object_t *, const audio_sample_format_t * );
+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);
goto out;
assert (owner->volume.mixer == NULL);
- owner->volume.mixer = aout_MixerNew (p_aout, &owner->mixer_format);
+ owner->volume.mixer = aout_MixerNew (p_aout, owner->mixer_format.i_format);
if (owner->volume.mixer == NULL)
{
aout_OutputDelete( p_aout );
return -1;
}
- owner->volume.mixer = aout_MixerNew (p_aout, &owner->mixer_format);
+ owner->volume.mixer = aout_MixerNew (p_aout, owner->mixer_format.i_format);
if (owner->volume.mixer == NULL)
{
aout_OutputDelete( p_aout );
/**
* Creates a software amplifier.
*/
-audio_mixer_t *aout_MixerNew(vlc_object_t *obj,
- const audio_sample_format_t *fmt)
+audio_mixer_t *aout_MixerNew(vlc_object_t *obj, vlc_fourcc_t format)
{
audio_mixer_t *mixer = vlc_custom_create(obj, sizeof (*mixer), "mixer");
if (unlikely(mixer == NULL))
return NULL;
- mixer->fmt = fmt;
+ mixer->format = format;
mixer->mix = NULL;
mixer->module = module_need(mixer, "audio mixer", NULL, false);
if (mixer->module == NULL)