aout_filter_t.(in|out)put -> aout_filter_t.fmt_(in|out).audio

[vlc] / modules / audio_filter / converter / dtstofloat32.c

diff --git a/modules/audio_filter/converter/dtstofloat32.c b/modules/audio_filter/converter/dtstofloat32.c
index 5e08a5f6ad24e7d769323e78255789ffb2520f83..3f9a5e713337ee256d9a3fe040a6571e66981a22 100644 (file)
--- a/modules/audio_filter/converter/dtstofloat32.c
+++ b/modules/audio_filter/converter/dtstofloat32.c
@@ -112,13 +112,13 @@ static int Create( vlc_object_t *p_this )
     filter_sys_t *p_sys;
     int i_ret;
 
-    if ( p_filter->input.i_format != VLC_CODEC_DTS
-          || p_filter->output.i_format != VLC_CODEC_FL32 )
+    if ( p_filter->fmt_in.audio.i_format != VLC_CODEC_DTS
+          || p_filter->fmt_out.audio.i_format != VLC_CODEC_FL32 )
     {
         return -1;
     }
 
-    if ( p_filter->input.i_rate != p_filter->output.i_rate )
+    if ( p_filter->fmt_in.audio.i_rate != p_filter->fmt_out.audio.i_rate )
     {
         return -1;
     }
@@ -130,7 +130,7 @@ static int Create( vlc_object_t *p_this )
         return -1;
 
     i_ret = Open( VLC_OBJECT(p_filter), p_sys,
-                  p_filter->input, p_filter->output );
+                  p_filter->fmt_in.audio, p_filter->fmt_out.audio );
 
     p_filter->pf_do_work = DoWork;
     p_filter->b_in_place = 0;
@@ -340,13 +340,13 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
         p_samples = dca_samples( p_sys->p_libdca );
 
         if ( (p_sys->i_flags & DCA_CHANNEL_MASK) == DCA_MONO
-              && (p_filter->output.i_physical_channels
+              && (p_filter->fmt_out.audio.i_physical_channels
                    & (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) )
         {
             Duplicate( (float *)(p_out_buf->p_buffer + i * i_bytes_per_block),
                        p_samples );
         }
-        else if ( p_filter->output.i_original_channels
+        else if ( p_filter->fmt_out.audio.i_original_channels
                     & AOUT_CHAN_REVERSESTEREO )
         {
             Exchange( (float *)(p_out_buf->p_buffer + i * i_bytes_per_block),
@@ -453,10 +453,10 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block )
     p_out->i_length = p_block->i_length;
 
     aout_filter.p_sys = (struct aout_filter_sys_t *)p_filter->p_sys;
-    aout_filter.input = p_filter->fmt_in.audio;
-    aout_filter.input.i_format = p_filter->fmt_in.i_codec;
-    aout_filter.output = p_filter->fmt_out.audio;
-    aout_filter.output.i_format = p_filter->fmt_out.i_codec;
+    aout_filter.fmt_in.audio = p_filter->fmt_in.audio;
+    aout_filter.fmt_in.audio.i_format = p_filter->fmt_in.i_codec;
+    aout_filter.fmt_out.audio = p_filter->fmt_out.audio;
+    aout_filter.fmt_out.audio.i_format = p_filter->fmt_out.i_codec;
 
     in_buf.p_buffer = p_block->p_buffer;
     in_buf.i_buffer = p_block->i_buffer;