[vlc-commits] aout: remove useless parameter to aout_FiltersNew()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Jan 18 21:34:45 2019 +0200| [01fcf9c1d18a5d6056f15c5f4594d9d67ceb53ff] | committer: Rémi Denis-Courmont

aout: remove useless parameter to aout_FiltersNew()

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

 include/vlc_aout.h                   |  5 ++---
 modules/stream_out/sdi/SDIStream.cpp |  2 +-
 modules/stream_out/transcode/audio.c |  2 +-
 src/audio_output/dec.c               | 12 +++++-------
 src/audio_output/filters.c           | 16 ++++------------
 5 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/include/vlc_aout.h b/include/vlc_aout.h
index 056d3b9b3e..896d9eb53f 100644
--- a/include/vlc_aout.h
+++ b/include/vlc_aout.h
@@ -496,10 +496,9 @@ typedef struct aout_request_vout aout_request_vout_t;
 VLC_API aout_filters_t *aout_FiltersNew(vlc_object_t *,
                                         const audio_sample_format_t *,
                                         const audio_sample_format_t *,
-                                        const aout_request_vout_t *,
                                         const aout_filters_cfg_t *cfg) VLC_USED;
-#define aout_FiltersNew(o,inf,outf,rv,remap) \
-        aout_FiltersNew(VLC_OBJECT(o),inf,outf,rv,remap)
+#define aout_FiltersNew(o,inf,outf,remap) \
+        aout_FiltersNew(VLC_OBJECT(o),inf,outf,remap)
 VLC_API void aout_FiltersDelete(vlc_object_t *, aout_filters_t *);
 #define aout_FiltersDelete(o,f) \
         aout_FiltersDelete(VLC_OBJECT(o),f)
diff --git a/modules/stream_out/sdi/SDIStream.cpp b/modules/stream_out/sdi/SDIStream.cpp
index 0c5047dbaa..a07b35504a 100644
--- a/modules/stream_out/sdi/SDIStream.cpp
+++ b/modules/stream_out/sdi/SDIStream.cpp
@@ -495,7 +495,7 @@ void AudioDecodedStream::Output(block_t *p_block)
 
 aout_filters_t * AudioDecodedStream::AudioFiltersCreate(const es_format_t *afmt)
 {
-    return aout_FiltersNew(p_stream, &afmt->audio, &requestedoutput.audio, NULL, NULL);
+    return aout_FiltersNew(p_stream, &afmt->audio, &requestedoutput.audio, NULL);
 }
 
 int AudioDecodedStream::AudioDecCallback_update_format(decoder_t *p_dec)
diff --git a/modules/stream_out/transcode/audio.c b/modules/stream_out/transcode/audio.c
index 95f22a6208..7c7ce6edbb 100644
--- a/modules/stream_out/transcode/audio.c
+++ b/modules/stream_out/transcode/audio.c
@@ -70,7 +70,7 @@ static int transcode_audio_filters_init( sout_stream_t *p_stream,
     var_Create( p_stream, "audio-filter", VLC_VAR_STRING );
     if( p_cfg->psz_filters )
         var_SetString( p_stream, "audio-filter", p_cfg->psz_filters );
-    *pp_chain = aout_FiltersNew( p_stream, p_dec_out, p_enc_in, NULL, NULL );
+    *pp_chain = aout_FiltersNew( p_stream, p_dec_out, p_enc_in, NULL );
     var_Destroy( p_stream, "audio-filter" );
     var_Destroy( p_stream, "audio-time-stretch" );
     return ( *pp_chain != NULL ) ? VLC_SUCCESS : VLC_EGENERIC;
diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c
index e94e60f752..83ee664ef7 100644
--- a/src/audio_output/dec.c
+++ b/src/audio_output/dec.c
@@ -87,9 +87,8 @@ int aout_DecNew( audio_output_t *p_aout,
     aout_volume_SetFormat (owner->volume, owner->mixer_format.i_format);
 
     /* Create the audio filtering "input" pipeline */
-    owner->filters = aout_FiltersNew (p_aout, p_format, &owner->mixer_format,
-                                      &owner->request_vout,
-                                      &owner->filters_cfg);
+    owner->filters = aout_FiltersNew(p_aout, p_format, &owner->mixer_format,
+                                     &owner->filters_cfg);
     if (owner->filters == NULL)
     {
         aout_OutputDelete (p_aout);
@@ -164,10 +163,9 @@ static int aout_CheckReady (audio_output_t *aout)
 
         if (owner->mixer_format.i_format)
         {
-            owner->filters = aout_FiltersNew (aout, &owner->input_format,
-                                              &owner->mixer_format,
-                                              &owner->request_vout,
-                                              &owner->filters_cfg);
+            owner->filters = aout_FiltersNew(aout, &owner->input_format,
+                                             &owner->mixer_format,
+                                             &owner->filters_cfg);
             if (owner->filters == NULL)
             {
                 aout_OutputDelete (aout);
diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c
index ce21c477a4..ab2b2457f0 100644
--- a/src/audio_output/filters.c
+++ b/src/audio_output/filters.c
@@ -486,21 +486,13 @@ static int AppendRemapFilter(vlc_object_t *obj, aout_filters_t *restrict filters
  * \param obj parent object for the filters
  * \param infmt chain input format [IN]
  * \param outfmt chain output format [IN]
- * \param request_vout visualization video output request callback
  * \param cfg a valid aout_filters_cfg_t struct or NULL.
  * \return a filters chain or NULL on failure
- *
- * \note
- * *request_vout (if not NULL) must remain valid until aout_FiltersDelete().
- *
- * \bug
- * If request_vout is non NULL, obj is assumed to be an audio_output_t pointer.
  */
-aout_filters_t *aout_FiltersNew (vlc_object_t *obj,
-                                 const audio_sample_format_t *restrict infmt,
-                                 const audio_sample_format_t *restrict outfmt,
-                                 const aout_request_vout_t *request_vout,
-                                 const aout_filters_cfg_t *cfg)
+aout_filters_t *aout_FiltersNew(vlc_object_t *obj,
+                                const audio_sample_format_t *restrict infmt,
+                                const audio_sample_format_t *restrict outfmt,
+                                const aout_filters_cfg_t *cfg)
 {
     aout_filters_t *filters = malloc (sizeof (*filters));
     if (unlikely(filters == NULL))