Commit ebfb9a5a authored by Laurent Aimar's avatar Laurent Aimar

Fixed resampler compilation after aout_mixer_t changes.

parent d29ead01
...@@ -196,7 +196,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, ...@@ -196,7 +196,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
if( p_sys->b_filter2 ) if( p_sys->b_filter2 )
i_out_rate = p_filter->output.i_rate; i_out_rate = p_filter->output.i_rate;
else else
i_out_rate = p_aout->mixer.mixer.i_rate; i_out_rate = p_aout->mixer_format.i_rate;
/* Check if we really need to run the resampler */ /* Check if we really need to run the resampler */
if( i_out_rate == p_filter->input.i_rate ) if( i_out_rate == p_filter->input.i_rate )
......
...@@ -145,7 +145,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, ...@@ -145,7 +145,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
int i_chan, i_in, i_out = 0; int i_chan, i_in, i_out = 0;
/* Check if we really need to run the resampler */ /* Check if we really need to run the resampler */
if( p_aout->mixer.mixer.i_rate == p_filter->input.i_rate ) if( p_aout->mixer_format.i_rate == p_filter->input.i_rate )
{ {
if( p_filter->b_continuity && if( p_filter->b_continuity &&
p_in_buf->i_size >= p_in_buf->i_size >=
......
...@@ -90,7 +90,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, ...@@ -90,7 +90,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
* sizeof(int32_t); * sizeof(int32_t);
/* Check if we really need to run the resampler */ /* Check if we really need to run the resampler */
if( p_aout->mixer.mixer.i_rate == p_filter->input.i_rate ) if( p_aout->mixer_format.i_rate == p_filter->input.i_rate )
{ {
return; return;
} }
......
...@@ -96,7 +96,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, ...@@ -96,7 +96,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
unsigned int i_out, i_chan, i_remainder = 0; unsigned int i_out, i_chan, i_remainder = 0;
/* Check if we really need to run the resampler */ /* Check if we really need to run the resampler */
if( p_aout->mixer.mixer.i_rate == p_filter->input.i_rate ) if( p_aout->mixer_format.i_rate == p_filter->input.i_rate )
{ {
return; return;
} }
......
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