Commit b914b985 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove constant { true } aout_instance_t.mixer_allocation

parent ac201136
...@@ -134,12 +134,6 @@ typedef int32_t vlc_fixed_t; ...@@ -134,12 +134,6 @@ typedef int32_t vlc_fixed_t;
/* Max input rate factor (1/4 -> 4) */ /* Max input rate factor (1/4 -> 4) */
#define AOUT_MAX_INPUT_RATE (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 */ /** audio output buffer FIFO */
struct aout_fifo_t struct aout_fifo_t
{ {
...@@ -206,7 +200,6 @@ struct aout_instance_t ...@@ -206,7 +200,6 @@ struct aout_instance_t
/* Mixer */ /* Mixer */
audio_sample_format_t mixer_format; audio_sample_format_t mixer_format;
aout_alloc_t mixer_allocation;
float mixer_multiplier; float mixer_multiplier;
struct aout_mixer_t *p_mixer; struct aout_mixer_t *p_mixer;
......
...@@ -76,7 +76,7 @@ struct aout_mixer_t { ...@@ -76,7 +76,7 @@ struct aout_mixer_t {
* *
* You can override it in the open function only. * 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 /* Multiplier used to raise or lower the volume of the sound in
* software. * software.
......
...@@ -69,7 +69,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -69,7 +69,7 @@ static int Create( vlc_object_t *p_this )
p_mixer->mix = DoWork; p_mixer->mix = DoWork;
/* This is a bit kludgy - do not ask for a new buffer, since the one /* This is a bit kludgy - do not ask for a new buffer, since the one
* provided by the first input will be good enough. */ * provided by the first input will be good enough. */
p_mixer->allocation.b_alloc = false; p_mixer->b_alloc = false;
return 0; return 0;
} }
......
...@@ -51,7 +51,7 @@ int aout_MixerNew( aout_instance_t * p_aout ) ...@@ -51,7 +51,7 @@ int aout_MixerNew( aout_instance_t * p_aout )
return VLC_EGENERIC; return VLC_EGENERIC;
p_mixer->fmt = p_aout->mixer_format; 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->multiplier = p_aout->mixer_multiplier;
p_mixer->input = &p_aout->pp_inputs[0]->mixer; p_mixer->input = &p_aout->pp_inputs[0]->mixer;
p_mixer->mix = NULL; p_mixer->mix = NULL;
...@@ -323,7 +323,7 @@ static int MixBuffer( aout_instance_t * p_aout ) ...@@ -323,7 +323,7 @@ static int MixBuffer( aout_instance_t * p_aout )
/* Run the mixer. */ /* Run the mixer. */
aout_buffer_t * p_outbuf; 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_outbuf = block_Alloc( p_aout->output.i_nb_samples
* p_aout->p_mixer->fmt.i_bytes_per_frame * p_aout->p_mixer->fmt.i_bytes_per_frame
......
...@@ -196,9 +196,6 @@ int aout_OutputNew( aout_instance_t * p_aout, ...@@ -196,9 +196,6 @@ int aout_OutputNew( aout_instance_t * p_aout,
p_aout->output.p_module = NULL; p_aout->output.p_module = NULL;
return -1; return -1;
} }
/* Prepare hints for the buffer allocator. */
p_aout->mixer_allocation.b_alloc = true;
return 0; return 0;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment