[vlc-commits] Core: Disable vout recycling for the visualization

[Adrien Maglo]

vlc | branch: master | Adrien Maglo <magsoft at videolan.org> | Mon Apr 14 14:36:06 2014 +0200| [3023adf17bf641557a122a70c59fc19ad17d7800] | committer: Jean-Baptiste Kempf

Core: Disable vout recycling for the visualization

This avoids the vout opened for by the "visual" module to stay
opened after having started an OpenGL based visualization.

This is a work-around for #9270, but noone fixed it/care enough since 2.1.x...

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 src/audio_output/filters.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c
index 796da1f..c6970a5 100644
--- a/src/audio_output/filters.c
+++ b/src/audio_output/filters.c
@@ -337,7 +337,9 @@ vout_thread_t *aout_filter_RequestVout (filter_t *filter, vout_thread_t *vout,
      * to aout_request_vout_t inside filter_t (i.e. a level of indirection). */
     const aout_request_vout_t *req = (void *)filter->p_owner;
     char *visual = var_InheritString (filter->p_parent, "audio-visual");
-    bool recycle = (visual != NULL) && strcasecmp(visual, "none");
+    /* 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;
     free (visual);
 
     return req->pf_request_vout (req->p_private, vout, fmt, recycle);