Fixed resampler compilation after aout_mixer_t changes.

diff --git a/modules/audio_filter/resampler/bandlimited.c b/modules/audio_filter/resampler/bandlimited.c
index b8aa4750866af0d6b2c6e24dff3cb96b4a1c0232..77424d784d023613835ff62838b2563e119392a5 100644 (file)
--- a/modules/audio_filter/resampler/bandlimited.c
+++ b/modules/audio_filter/resampler/bandlimited.c
@@ -196,7 +196,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     if( p_sys->b_filter2 )
         i_out_rate = p_filter->output.i_rate;
     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 */
     if( i_out_rate == p_filter->input.i_rate )

diff --git a/modules/audio_filter/resampler/linear.c b/modules/audio_filter/resampler/linear.c
index 5dfd10d9976cc69999ff8e773e3d350fe21beb79..47750feef95a04f1cb93de7927f624bb67806e74 100644 (file)
--- a/modules/audio_filter/resampler/linear.c
+++ b/modules/audio_filter/resampler/linear.c
@@ -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;
 
     /* 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 &&
             p_in_buf->i_size >=

diff --git a/modules/audio_filter/resampler/trivial.c b/modules/audio_filter/resampler/trivial.c
index 16918681e19af08ea9e1f6d52e575cd35fa63fd9..326522919f7416f29aa160bbdaf8ad3a9fe48a18 100644 (file)
--- a/modules/audio_filter/resampler/trivial.c
+++ b/modules/audio_filter/resampler/trivial.c
@@ -90,7 +90,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
                           * sizeof(int32_t);
 
     /* 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;
     }

diff --git a/modules/audio_filter/resampler/ugly.c b/modules/audio_filter/resampler/ugly.c
index 059d0074c0e14a45225bc237486fc6205ed6eb4a..ced138c8721df5766dc02a432e59f996fccd6d58 100644 (file)
--- a/modules/audio_filter/resampler/ugly.c
+++ b/modules/audio_filter/resampler/ugly.c
@@ -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;
 
     /* 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;
     }