[vlc-devel] commit: Fixed resampler compilation after aout_mixer_t changes. ( Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Tue Aug 25 22:42:18 2009 +0200| [ebfb9a5a97a3c3c6f6f9a7ab13b9ec52b74218b6] | committer: Laurent Aimar 

Fixed resampler compilation after aout_mixer_t changes.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ebfb9a5a97a3c3c6f6f9a7ab13b9ec52b74218b6
---

 modules/audio_filter/resampler/bandlimited.c |    2 +-
 modules/audio_filter/resampler/linear.c      |    2 +-
 modules/audio_filter/resampler/trivial.c     |    2 +-
 modules/audio_filter/resampler/ugly.c        |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/audio_filter/resampler/bandlimited.c b/modules/audio_filter/resampler/bandlimited.c
index b8aa475..77424d7 100644
--- 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 5dfd10d..47750fe 100644
--- 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 1691868..3265229 100644
--- 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 059d007..ced138c 100644
--- 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;
     }