[vlc-commits] aout: remove write-only parameter

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Nov 11 16:00:45 2012 +0200| [7efec6d698a89b0f770f58d6b6582ce0df006549] | committer: Rémi Denis-Courmont

aout: remove write-only parameter

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

 src/audio_output/aout_internal.h |    4 +---
 src/audio_output/dec.c           |    4 ++--
 src/audio_output/input.c         |    4 +---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h
index b5c8dc8..aa5f4dd 100644
--- a/src/audio_output/aout_internal.h
+++ b/src/audio_output/aout_internal.h
@@ -49,8 +49,6 @@ typedef struct aout_volume aout_volume_t;
 /** an input stream for the audio output */
 struct aout_input_t
 {
-    unsigned            samplerate; /**< Input sample rate */
-
     int                     i_resampling_type;
     int                     i_resamp_start_drift;
 
@@ -108,7 +106,7 @@ static inline aout_owner_t *aout_owner (audio_output_t *aout)
  *****************************************************************************/
 
 /* From input.c : */
-aout_input_t *aout_InputNew(const audio_sample_format_t *);
+aout_input_t *aout_InputNew(void);
 void aout_InputDelete(aout_input_t *);
 block_t *aout_InputPlay( audio_output_t *p_aout, aout_input_t *p_input,
                          block_t *p_buffer, int i_input_rate, date_t * );
diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c
index 9c66267..82dfa34 100644
--- a/src/audio_output/dec.c
+++ b/src/audio_output/dec.c
@@ -97,7 +97,7 @@ error:
     date_Set (&owner->sync.date, VLC_TS_INVALID);
 
     assert (owner->input == NULL);
-    owner->input = aout_InputNew (p_format);
+    owner->input = aout_InputNew ();
     aout_unlock( p_aout );
     return ret;
 }
@@ -160,7 +160,7 @@ static void aout_CheckRestart (audio_output_t *aout)
 
     if (aout_FiltersNew (aout, &owner->input_format, &owner->mixer_format,
                          &request_vout) == 0)
-        owner->input = aout_InputNew (&owner->input_format);
+        owner->input = aout_InputNew ();
 }
 
 /**
diff --git a/src/audio_output/input.c b/src/audio_output/input.c
index f717957..61528b9 100644
--- a/src/audio_output/input.c
+++ b/src/audio_output/input.c
@@ -43,12 +43,10 @@ static void inputResamplingStop( audio_output_t *, aout_input_t * );
 /*****************************************************************************
  * aout_InputNew : allocate a new input and rework the filter pipeline
  *****************************************************************************/
-aout_input_t *aout_InputNew (const audio_sample_format_t *restrict infmt)
+aout_input_t *aout_InputNew (void)
 {
     aout_input_t *p_input = xmalloc (sizeof (*p_input));
 
-    p_input->samplerate = infmt->i_rate;
-
     p_input->i_resampling_type = AOUT_RESAMPLING_NONE;
     p_input->i_last_input_rate = INPUT_RATE_DEFAULT;
     p_input->i_buffer_lost = 0;