[vlc-commits] aout: inline one function and simplify

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Apr  7 18:45:12 2013 +0300| [edada22bdb0c45d13d5c37450d25d60b3d4867e8] | committer: Rémi Denis-Courmont

aout: inline one function and simplify

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

 src/audio_output/filters.c |   25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c
index 5e48f6a..b29833b 100644
--- a/src/audio_output/filters.c
+++ b/src/audio_output/filters.c
@@ -250,12 +250,6 @@ error:
 #define aout_FiltersPipelineCreate(obj,f,n,m,i,o) \
         aout_FiltersPipelineCreate(VLC_OBJECT(obj),f,n,m,i,o)
 
-static inline bool ChangeFiltersString (vlc_object_t *aout, const char *var,
-                                        const char *filter, bool add)
-{
-    return aout_ChangeFilterString (aout, aout, var, filter, add);
-}
-
 /**
  * Filters an audio buffer through a chain of filters.
  */
@@ -300,26 +294,21 @@ static int VisualizationCallback (vlc_object_t *obj, const char *var,
     return VLC_SUCCESS;
 }
 
-static int EqualizerCallback (vlc_object_t *obj, char const *var,
+static int EqualizerCallback (vlc_object_t *obj, const char *var,
                               vlc_value_t oldval, vlc_value_t newval,
                               void *data)
 {
-    audio_output_t *aout = (audio_output_t *)obj;
-    char *mode = newval.psz_string;
-    bool ret;
+    const char *val = newval.psz_string;
 
-    if (!*mode)
-        ret = ChangeFiltersString (obj, "audio-filter", "equalizer", false);
-    else
+    if (*val)
     {
         var_Create (obj, "equalizer-preset", VLC_VAR_STRING);
-        var_SetString (obj, "equalizer-preset", mode);
-        ret = ChangeFiltersString (obj, "audio-filter", "equalizer", true);
+        var_SetString (obj, "equalizer-preset", val);
     }
 
-    /* That sucks */
-    if (ret)
-        aout_InputRequestRestart (aout);
+    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;
 }