[vlc-commits] visual: default is none, not any (fixes #8354)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Mar 27 22:50:33 2013 +0200| [7bd008c0f8ed895350cc93b8fd28be7532cba85b] | committer: Rémi Denis-Courmont

visual: default is none, not any (fixes #8354)

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

 src/audio_output/filters.c |    7 ++++++-
 src/libvlc-module.c        |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c
index b46fc2d..4582693 100644
--- a/src/audio_output/filters.c
+++ b/src/audio_output/filters.c
@@ -457,6 +457,11 @@ int aout_FiltersNew (audio_output_t *aout,
         var_InheritBool (aout, "audio-time-stretch") ? "scaletempo" : NULL;
     char *filters = var_InheritString (aout, "audio-filter");
     char *visual = var_InheritString (aout, "audio-visual");
+    if (visual != NULL && !strcasecmp (visual, "none"))
+    {
+        free (visual);
+        visual = NULL;
+    }
 
     if (request_vout != NULL)
         owner->request_vout = *request_vout;
@@ -465,7 +470,7 @@ int aout_FiltersNew (audio_output_t *aout,
         owner->request_vout.pf_request_vout = RequestVout;
         owner->request_vout.p_private = aout;
     }
-    owner->recycle_vout = (visual != NULL) && *visual;
+    owner->recycle_vout = visual != NULL;
 
     /* parse user filter lists */
     const char *list[AOUT_MAX_FILTERS];
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index f9a1725..522d48a 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1504,7 +1504,7 @@ vlc_module_begin ()
     add_module_list( "audio-filter", "audio filter", NULL,
                      AUDIO_FILTER_TEXT, AUDIO_FILTER_LONGTEXT, false )
     set_subcategory( SUBCAT_AUDIO_VISUAL )
-    add_module( "audio-visual", "visualization2", NULL,AUDIO_VISUAL_TEXT,
+    add_module( "audio-visual", "visualization2", "none", AUDIO_VISUAL_TEXT,
                 AUDIO_VISUAL_LONGTEXT, false )
 
 /* Video options */