[vlc-commits] aout: remove the bands callback (fixes #9350)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat May 24 12:43:01 2014 +0800| [5885650efe3cddc3dd3f5a6ea4b78baff928b826] | committer: Rémi Denis-Courmont

aout: remove the bands callback (fixes #9350)

playlist_EnableAudioFilter() can be used to turn the equalizer on or off.
The GUI already does so.

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

 src/audio_output/filters.c |   22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c
index 17973d8..8af9cf0 100644
--- a/src/audio_output/filters.c
+++ b/src/audio_output/filters.c
@@ -310,19 +310,6 @@ static int VisualizationCallback (vlc_object_t *obj, const char *var,
     return VLC_SUCCESS;
 }
 
-static int EqualizerCallback (vlc_object_t *obj, const char *var,
-                              vlc_value_t oldval, vlc_value_t newval,
-                              void *data)
-{
-    const char *val = newval.psz_string;
-
-    if (aout_ChangeFilterString (obj, obj, "audio-filter", "equalizer", *val))
-        aout_InputRequestRestart ((audio_output_t *)obj); /* <- That sucks! */
-
-    (void) var; (void) oldval; (void) data;
-    return VLC_SUCCESS;
-}
-
 vout_thread_t *aout_filter_RequestVout (filter_t *filter, vout_thread_t *vout,
                                         video_format_t *fmt)
 {
@@ -413,13 +400,8 @@ aout_filters_t *aout_FiltersNew (vlc_object_t *obj,
 
     /* Callbacks (before reading values and also before return statement) */
     if (request_vout != NULL)
-    {
-        var_AddCallback (obj, "equalizer-bands", EqualizerCallback, NULL);
         var_AddCallback (obj, "visual", VisualizationCallback, NULL);
 
-        var_TriggerCallback( obj, "equalizer-bands" );
-    }
-
     /* Now add user filters */
     if (!AOUT_FMT_LINEAR(outfmt))
     {   /* Non-linear output: just convert formats, no filters/visu */
@@ -493,7 +475,6 @@ aout_filters_t *aout_FiltersNew (vlc_object_t *obj,
 
 error:
     aout_FiltersPipelineDestroy (filters->tab, filters->count);
-    var_DelCallback (obj, "equalizer-bands", EqualizerCallback, NULL);
     var_DelCallback (obj, "visual", VisualizationCallback, NULL);
     free (filters);
     return NULL;
@@ -514,10 +495,7 @@ void aout_FiltersDelete (vlc_object_t *obj, aout_filters_t *filters)
         aout_FiltersPipelineDestroy (&filters->resampler, 1);
     aout_FiltersPipelineDestroy (filters->tab, filters->count);
     if (obj != NULL)
-    {
-        var_DelCallback (obj, "equalizer-bands", EqualizerCallback, NULL);
         var_DelCallback (obj, "visual", VisualizationCallback, NULL);
-    }
     free (filters);
 }