audiod: Kill noisy debug message.

[paraslash.git] / amp_filter.c

diff --git a/amp_filter.c b/amp_filter.c
index 101224649f93936b163d148d0928bbbc2f23d0fd..690080bd2844073b2dc82168a7c5accf6e7221b3 100644 (file)
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -75,8 +75,6 @@ static int amp_parse_config(int argc, char **argv, void **config)
        ret = -ERRNO_TO_PARA_ERROR(EINVAL);
        if (amp_conf->amp_arg < 0)
                goto err;
        ret = -ERRNO_TO_PARA_ERROR(EINVAL);
        if (amp_conf->amp_arg < 0)
                goto err;

-       PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n",
-               amp_conf->amp_arg, amp_conf->amp_arg / 64.0 + 1.0);

        *config = amp_conf;
        return 1;
 err:
        *config = amp_conf;
        return 1;
 err:


@@ -97,6 +95,8 @@ static void amp_open(struct filter_node *fn)
                pad->amp = pad->conf->amp_arg;
        fn->bufsize = AMP_CHUNK_SIZE;
        fn->buf = para_malloc(fn->bufsize);
                pad->amp = pad->conf->amp_arg;
        fn->bufsize = AMP_CHUNK_SIZE;
        fn->buf = para_malloc(fn->bufsize);

+       PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n",
+               pad->amp, pad->amp / 64.0 + 1.0);

 }
 
 static void amp_post_select(__a_unused struct sched *s, struct task *t)
 }
 
 static void amp_post_select(__a_unused struct sched *s, struct task *t)


@@ -112,11 +112,10 @@ static void amp_post_select(__a_unused struct sched *s, struct task *t)
        if (pad->amp == 0) { /* no amplification */
                t->error = -E_AMP_ZERO_AMP;
                btr_splice_out_node(btrn);
        if (pad->amp == 0) { /* no amplification */
                t->error = -E_AMP_ZERO_AMP;
                btr_splice_out_node(btrn);

-               amp_close(fn);

                return;
        }
 next_buffer:
                return;
        }
 next_buffer:

-       ret = btr_node_status(btrn, fn->min_iqs);
+       ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);

        if (ret < 0)
                goto err;
        if (ret == 0)
        if (ret < 0)
                goto err;
        if (ret == 0)


@@ -153,8 +152,12 @@ next_buffer:
 err:
        assert(ret < 0);
        t->error = ret;
 err:
        assert(ret < 0);
        t->error = ret;

-       btr_del_node(btrn);
-       amp_close(fn);
+       btr_remove_node(btrn);
+}
+
+static void amp_free_config(void *conf)
+{
+       amp_cmdline_parser_free(conf);

 }
 
 /**
 }
 
 /**


@@ -173,6 +176,7 @@ void amp_filter_init(struct filter *f)
        f->pre_select = generic_filter_pre_select;
        f->post_select = amp_post_select;
        f->parse_config = amp_parse_config;
        f->pre_select = generic_filter_pre_select;
        f->post_select = amp_post_select;
        f->parse_config = amp_parse_config;

+       f->free_config = amp_free_config;

        f->help = (struct ggo_help) {
                .short_help = amp_filter_args_info_help,
                .detailed_help = amp_filter_args_info_detailed_help
        f->help = (struct ggo_help) {
                .short_help = amp_filter_args_info_help,
                .detailed_help = amp_filter_args_info_detailed_help