[vlc-commits] Remove constant { true } aout_instance_t.mixer_allocation

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon May 30 19:51:03 2011 +0300| [b914b9855f27d503538345155aa68ec4f8df4141] | committer: Rémi Denis-Courmont

Remove constant { true } aout_instance_t.mixer_allocation

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

 include/vlc_aout.h          |    7 -------
 include/vlc_aout_mixer.h    |    2 +-
 modules/audio_mixer/spdif.c |    2 +-
 src/audio_output/mixer.c    |    4 ++--
 src/audio_output/output.c   |    3 ---
 5 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/include/vlc_aout.h b/include/vlc_aout.h
index 6fcb809..1016794 100644
--- a/include/vlc_aout.h
+++ b/include/vlc_aout.h
@@ -134,12 +134,6 @@ typedef int32_t vlc_fixed_t;
 /* Max input rate factor (1/4 -> 4) */
 #define AOUT_MAX_INPUT_RATE (4)
 
-/** allocation of memory in the audio output */
-typedef struct aout_alloc_t
-{
-    bool                    b_alloc;
-} aout_alloc_t;
-
 /** audio output buffer FIFO */
 struct aout_fifo_t
 {
@@ -206,7 +200,6 @@ struct aout_instance_t
 
     /* Mixer */
     audio_sample_format_t   mixer_format;
-    aout_alloc_t            mixer_allocation;
     float                   mixer_multiplier;
     struct aout_mixer_t    *p_mixer;
 
diff --git a/include/vlc_aout_mixer.h b/include/vlc_aout_mixer.h
index 10d80fe..fbe55ce 100644
--- a/include/vlc_aout_mixer.h
+++ b/include/vlc_aout_mixer.h
@@ -76,7 +76,7 @@ struct aout_mixer_t {
      *
      * You can override it in the open function only.
      */
-    aout_alloc_t          allocation;
+    bool b_alloc;
 
     /* Multiplier used to raise or lower the volume of the sound in
      * software.
diff --git a/modules/audio_mixer/spdif.c b/modules/audio_mixer/spdif.c
index 5accc7e..253dfae 100644
--- a/modules/audio_mixer/spdif.c
+++ b/modules/audio_mixer/spdif.c
@@ -69,7 +69,7 @@ static int Create( vlc_object_t *p_this )
     p_mixer->mix = DoWork;
     /* This is a bit kludgy - do not ask for a new buffer, since the one
      * provided by the first input will be good enough. */
-    p_mixer->allocation.b_alloc = false;
+    p_mixer->b_alloc = false;
 
     return 0;
 }
diff --git a/src/audio_output/mixer.c b/src/audio_output/mixer.c
index 78537ad..90e396c 100644
--- a/src/audio_output/mixer.c
+++ b/src/audio_output/mixer.c
@@ -51,7 +51,7 @@ int aout_MixerNew( aout_instance_t * p_aout )
         return VLC_EGENERIC;
 
     p_mixer->fmt = p_aout->mixer_format;
-    p_mixer->allocation = p_aout->mixer_allocation;
+    p_mixer->b_alloc = true;
     p_mixer->multiplier = p_aout->mixer_multiplier;
     p_mixer->input = &p_aout->pp_inputs[0]->mixer;
     p_mixer->mix = NULL;
@@ -323,7 +323,7 @@ static int MixBuffer( aout_instance_t * p_aout )
     /* Run the mixer. */
     aout_buffer_t * p_outbuf;
 
-    if( p_aout->p_mixer->allocation.b_alloc )
+    if( p_aout->p_mixer->b_alloc )
     {
         p_outbuf = block_Alloc( p_aout->output.i_nb_samples
                               * p_aout->p_mixer->fmt.i_bytes_per_frame
diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index c2a4517..6fe20e2 100644
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -196,9 +196,6 @@ int aout_OutputNew( aout_instance_t * p_aout,
         p_aout->output.p_module = NULL;
         return -1;
     }
-
-    /* Prepare hints for the buffer allocator. */
-    p_aout->mixer_allocation.b_alloc = true;
     return 0;
 }