[vlc-commits] Remove write-only aout_input_t.input_alloc

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Apr  9 18:37:44 2011 +0300| [bce9264e49d2d4c1604296cbd7c00cf15696cc14] | committer: Rémi Denis-Courmont

Remove write-only aout_input_t.input_alloc

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

 src/audio_output/aout_internal.h |    1 -
 src/audio_output/input.c         |   21 ---------------------
 2 files changed, 0 insertions(+), 22 deletions(-)

diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h
index 5282623..fb87f52 100644
--- a/src/audio_output/aout_internal.h
+++ b/src/audio_output/aout_internal.h
@@ -50,7 +50,6 @@ struct aout_input_t
     vlc_mutex_t             lock;
 
     audio_sample_format_t   input;
-    aout_alloc_t            input_alloc;
 
     /* pre-filters */
     filter_t *              pp_filters[AOUT_MAX_FILTERS];
diff --git a/src/audio_output/input.c b/src/audio_output/input.c
index 8fcd834..be83a6f 100644
--- a/src/audio_output/input.c
+++ b/src/audio_output/input.c
@@ -395,10 +395,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_
         }
     }
 
-    /* Prepare hints for the buffer allocator. */
-    p_input->input_alloc.b_alloc = true;
-    p_input->input_alloc.i_bytes_per_sec = -1;
-
     /* Create resamplers. */
     if ( !AOUT_FMT_NON_LINEAR( &p_aout->mixer_format ) )
     {
@@ -419,11 +415,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_
             return -1;
         }
 
-        aout_FiltersHintBuffers( p_aout, p_input->pp_resamplers,
-                                 p_input->i_nb_resamplers,
-                                 &p_input->input_alloc );
-        p_input->input_alloc.b_alloc = true;
-
         /* Setup the initial rate of the resampler */
         p_input->pp_resamplers[0]->fmt_in.audio.i_rate = p_input->input.i_rate;
     }
@@ -434,18 +425,6 @@ int aout_InputNew( aout_instance_t * p_aout, aout_input_t * p_input, const aout_
         p_input->p_playback_rate_filter = p_input->pp_resamplers[0];
     }
 
-    aout_FiltersHintBuffers( p_aout, p_input->pp_filters,
-                             p_input->i_nb_filters,
-                             &p_input->input_alloc );
-    p_input->input_alloc.b_alloc = true;
-
-    /* i_bytes_per_sec is still == -1 if no filters */
-    p_input->input_alloc.i_bytes_per_sec = __MAX(
-                                    p_input->input_alloc.i_bytes_per_sec,
-                                    (int)(p_input->input.i_bytes_per_frame
-                                     * p_input->input.i_rate
-                                     / p_input->input.i_frame_length) );
-
     ReplayGainSelect( p_aout, p_input );
 
     /* Success */