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

[vlc] / modules / audio_filter / normvol.c

diff --git a/modules/audio_filter/normvol.c b/modules/audio_filter/normvol.c
index f67f24c6baa610312c9e7863a9213d1b50249385..ef80e2d67bb456ec65c4b54427ddb8a739dc0309 100644 (file)
--- a/modules/audio_filter/normvol.c
+++ b/modules/audio_filter/normvol.c
@@ -103,19 +103,19 @@ static int Open( vlc_object_t *p_this )
     int i_channels;
     aout_filter_sys_t *p_sys;
 
-    if( p_filter->input.i_format != VLC_CODEC_FL32 ||
-        p_filter->output.i_format != VLC_CODEC_FL32 )
+    if( p_filter->fmt_in.audio.i_format != VLC_CODEC_FL32 ||
+        p_filter->fmt_out.audio.i_format != VLC_CODEC_FL32 )
     {
         b_fit = false;
-        p_filter->input.i_format = VLC_CODEC_FL32;
-        p_filter->output.i_format = VLC_CODEC_FL32;
+        p_filter->fmt_in.audio.i_format = VLC_CODEC_FL32;
+        p_filter->fmt_out.audio.i_format = VLC_CODEC_FL32;
         msg_Warn( p_filter, "bad input or output format" );
     }
 
-    if ( !AOUT_FMTS_SIMILAR( &p_filter->input, &p_filter->output ) )
+    if ( !AOUT_FMTS_SIMILAR( &p_filter->fmt_in.audio, &p_filter->fmt_out.audio ) )
     {
         b_fit = false;
-        memcpy( &p_filter->output, &p_filter->input,
+        memcpy( &p_filter->fmt_out.audio, &p_filter->fmt_in.audio,
                 sizeof(audio_sample_format_t) );
         msg_Warn( p_filter, "input and output formats are not similar" );
     }
@@ -128,7 +128,7 @@ static int Open( vlc_object_t *p_this )
     p_filter->pf_do_work = DoWork;
     p_filter->b_in_place = true;
 
-    i_channels = aout_FormatNbChannels( &p_filter->input );
+    i_channels = aout_FormatNbChannels( &p_filter->fmt_in.audio );
 
     p_sys = p_filter->p_sys = malloc( sizeof( aout_filter_sys_t ) );
     if( !p_sys )
@@ -161,7 +161,7 @@ static int Open( vlc_object_t *p_this )
     int i, i_chan;
 
     int i_samples = p_in_buf->i_nb_samples;
-    int i_channels = aout_FormatNbChannels( &p_filter->input );
+    int i_channels = aout_FormatNbChannels( &p_filter->fmt_in.audio );
     float *p_out = (float*)p_out_buf->p_buffer;
     float *p_in =  (float*)p_in_buf->p_buffer;