/* Max input rate factor (1/4 -> 4) */
#define AOUT_MAX_INPUT_RATE (4)
-/** allocation of memory in the audio output */
-typedef struct aout_alloc_t
-{
- bool b_alloc;
-} aout_alloc_t;
-
/** audio output buffer FIFO */
struct aout_fifo_t
{
/* Mixer */
audio_sample_format_t mixer_format;
- aout_alloc_t mixer_allocation;
float mixer_multiplier;
struct aout_mixer_t *p_mixer;
*
* You can override it in the open function only.
*/
- aout_alloc_t allocation;
+ bool b_alloc;
/* Multiplier used to raise or lower the volume of the sound in
* software.
p_mixer->mix = DoWork;
/* This is a bit kludgy - do not ask for a new buffer, since the one
* provided by the first input will be good enough. */
- p_mixer->allocation.b_alloc = false;
+ p_mixer->b_alloc = false;
return 0;
}
return VLC_EGENERIC;
p_mixer->fmt = p_aout->mixer_format;
- p_mixer->allocation = p_aout->mixer_allocation;
+ p_mixer->b_alloc = true;
p_mixer->multiplier = p_aout->mixer_multiplier;
p_mixer->input = &p_aout->pp_inputs[0]->mixer;
p_mixer->mix = NULL;
/* Run the mixer. */
aout_buffer_t * p_outbuf;
- if( p_aout->p_mixer->allocation.b_alloc )
+ if( p_aout->p_mixer->b_alloc )
{
p_outbuf = block_Alloc( p_aout->output.i_nb_samples
* p_aout->p_mixer->fmt.i_bytes_per_frame
p_aout->output.p_module = NULL;
return -1;
}
-
- /* Prepare hints for the buffer allocator. */
- p_aout->mixer_allocation.b_alloc = true;
return 0;
}