Merge branch 't/fade_improvements'

[paraslash.git] / amp_filter.c

diff --git a/amp_filter.c b/amp_filter.c
index 7e88cc495f2f805196c60ff45538050dc7c33338..2edfdd5879913ab9c66c8146e81e5c6a508f257f 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;
 };
@@ -38,7 +37,7 @@ static int amp_parse_config(int argc, char **argv, void **config)
        struct amp_filter_args_info *amp_conf = para_calloc(sizeof(*amp_conf));
        int ret = -E_AMP_SYNTAX;
 
-       if (amp_cmdline_parser(argc, argv, amp_conf))
+       if (amp_filter_cmdline_parser(argc, argv, amp_conf))
                goto err;
        ret = -ERRNO_TO_PARA_ERROR(EINVAL);
        if (amp_conf->amp_arg < 0)
@@ -53,14 +52,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);
 }
@@ -123,7 +122,7 @@ err:
 
 static void amp_free_config(void *conf)
 {
-       amp_cmdline_parser_free(conf);
+       amp_filter_cmdline_parser_free(conf);
 }
 
 /**
@@ -135,7 +134,7 @@ void amp_filter_init(struct filter *f)
 {
        struct amp_filter_args_info dummy;
 
-       amp_cmdline_parser_init(&dummy);
+       amp_filter_cmdline_parser_init(&dummy);
        f->open = amp_open;
        f->close = amp_close;
        f->pre_select = generic_filter_pre_select;