[vlc-commits] aout: remove constant recycle parameter

Rémi Denis-Courmont git at videolan.org
Fri Jan 18 22:12:39 CET 2019


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Jan 18 19:33:08 2019 +0200| [80727d10b757d80a6a5e5f76df1d3c76e14d6f60] | committer: Rémi Denis-Courmont

aout: remove constant recycle parameter

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

 src/audio_output/aout_internal.h | 2 +-
 src/audio_output/filters.c       | 5 +----
 src/input/decoder.c              | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h
index 6f3b944155..1459a86bda 100644
--- a/src/audio_output/aout_internal.h
+++ b/src/audio_output/aout_internal.h
@@ -39,7 +39,7 @@ enum {
 struct aout_request_vout
 {
     struct vout_thread_t  *(*pf_request_vout)( void *, struct vout_thread_t *,
-                                               const video_format_t *, bool );
+                                               const video_format_t *);
     void *p_private;
 };
 
diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c
index d82622022d..463c6fccf7 100644
--- a/src/audio_output/filters.c
+++ b/src/audio_output/filters.c
@@ -390,11 +390,8 @@ vout_thread_t *aout_filter_RequestVout (filter_t *filter, vout_thread_t *vout,
      * need to add a new pf_aout_request_vout callback or store a pointer
      * to aout_request_vout_t inside filter_t (i.e. a level of indirection). */
     const aout_request_vout_t *req = filter->owner.sys;
-    /* NOTE: Disable recycling to always close the filter vout because OpenGL
-     * visualizations do not use this function to ask for a context. */
-    bool recycle = false;
 
-    return req->pf_request_vout (req->p_private, vout, fmt, recycle);
+    return req->pf_request_vout(req->p_private, vout, fmt);
 }
 
 static int AppendFilter(vlc_object_t *obj, const char *type, const char *name,
diff --git a/src/input/decoder.c b/src/input/decoder.c
index 21a7628b6c..d4a6ce2ad5 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -303,7 +303,7 @@ static void MouseEvent( const vlc_mouse_t *newmouse, void *user_data )
  *****************************************************************************/
 static vout_thread_t *aout_request_vout( void *p_private,
                                          vout_thread_t *p_vout,
-                                         const video_format_t *p_fmt, bool b_recyle )
+                                         const video_format_t *p_fmt )
 {
     decoder_t *p_dec = p_private;
     struct decoder_owner *p_owner = dec_get_owner( p_dec );
@@ -318,7 +318,7 @@ static vout_thread_t *aout_request_vout( void *p_private,
 
     p_vout = input_resource_RequestVout( p_owner->p_resource,
         &(vout_configuration_t){ .vout = p_vout, .fmt = p_fmt, .dpb_size = 1 },
-        b_recyle );
+        false );
 
     return p_vout;
 }



More information about the vlc-commits mailing list