Merge branch 't/osx_writer_improvements'

[paraslash.git] / amp_filter.c

diff --git a/amp_filter.c b/amp_filter.c
index 4c3a336c6ba64650ccecf5033392aa4e558c2427..7b59248549b327255e4a9468c14e3f4189764e60 100644 (file)
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -23,7 +23,6 @@ extern char *stat_item_values[NUM_STAT_ITEMS];
 /** Data specific to the amplify filter. */
 struct private_amp_data {
        /** Points to the configuration data for this instance of this filter. */
-       struct amp_filter_args_info *conf;
        /** Amplification factor. */
        unsigned amp;
 };
@@ -52,14 +51,14 @@ err:
 static void amp_open(struct filter_node *fn)
 {
        struct private_amp_data *pad = para_calloc(sizeof(*pad));
+       struct amp_filter_args_info *conf = fn->conf;
 
-       pad->conf = fn->conf;
        fn->private_data = pad;
        fn->min_iqs = 2;
-       if (!pad->conf->amp_given && stat_item_values[SI_AMPLIFICATION])
+       if (!conf->amp_given && stat_item_values[SI_AMPLIFICATION])
                sscanf(stat_item_values[SI_AMPLIFICATION], "%u", &pad->amp);
        else
-               pad->amp = pad->conf->amp_arg;
+               pad->amp = conf->amp_arg;
        PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n",
                pad->amp, pad->amp / 64.0 + 1.0);
 }