Switch audiod over to the buffer tree API.

[paraslash.git] / filter.c

diff --git a/filter.c b/filter.c
index 45f4bff099873be853cd2bf1f38d7327b9496822..599aaad97815b67c68464c094866ce4d1bd6e5a4 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -154,39 +154,62 @@ static int parse_config(int argc, char *argv[])
        return 1;
 }
 
-/* TODO: support more than one filter, actually parse options */
-static int __noreturn main_btr(int argc, char *argv[])
+/* TODO: support buffer tree, not just a chain. */
+static int __noreturn main_btr(void)
 {
        static struct sched s;
-       struct filter_node *fn = para_calloc(sizeof(*fn));
-       int ret;
+       int i, ret;
        struct filter *f;
+       struct btr_node *parent;
+       struct filter_node **fns;
 
        sit->btrn = btr_new_node("stdin", NULL, NULL, NULL);
        stdin_set_defaults(sit);
        register_task(&sit->task);
 
-       ret = check_filter_arg("mp3dec ", &fn->conf);
-       if (ret < 0)
-               goto err;
-       fn->filter_num = ret;
-       f = filters + fn->filter_num;
-       fn->btrn = btr_new_node(f->name, sit->btrn, f->execute, fn);
-       fn->task.pre_select = f->pre_select;
-       fn->task.post_select = f->post_select;
-       sprintf(fn->task.status, "mp3dec");
-       f->open(fn);
-       register_task(&fn->task);
-
-       sot->btrn = btr_new_node("stdout", fn->btrn, NULL, NULL);
+       fns = para_malloc(conf.filter_given * sizeof(*fns));
+       for (i = 0, parent = sit->btrn; i < conf.filter_given; i++) {
+               char *fa = conf.filter_arg[i];
+               struct filter_node *fn;
+
+               fn = fns[i] = para_calloc(sizeof(*fn));
+               ret = check_filter_arg(fa, &fn->conf);
+               if (ret < 0) {
+                       free(fn);
+                       goto out;
+               }
+               fn->filter_num = ret;
+               f = filters + fn->filter_num;
+               sprintf(fn->task.status, "%s", f->name);
+               PARA_DEBUG_LOG("filter #%d: %s\n", i, f->name);
+               fn->btrn = btr_new_node(f->name, parent, f->execute, fn);
+               fn->task.pre_select = f->pre_select;
+               fn->task.post_select = f->post_select;
+               f->open(fn);
+               register_task(&fn->task);
+               parent = fn->btrn;
+       }
+       sot->btrn = btr_new_node("stdout", parent, NULL, NULL);
        stdout_set_defaults(sot);
        register_task(&sot->task);
 
        s.default_timeout.tv_sec = 1;
        s.default_timeout.tv_usec = 0;
+       btr_log_tree(sit->btrn, LL_INFO);
        ret = schedule(&s);
-err:
-       free(fn);
+out:
+       for (i--; i >= 0; i--) {
+               struct filter_node *fn = fns[i];
+
+               f = filters + fn->filter_num;
+               f->close(fn);
+               btr_free_node(fn->btrn);
+               free(fn->conf);
+               free(fn);
+       }
+       free(fns);
+       btr_free_node(sit->btrn);
+       btr_free_node(sot->btrn);
        if (ret < 0)
                PARA_EMERG_LOG("%s\n", para_strerror(-ret));
        exit(ret < 0? EXIT_FAILURE : EXIT_SUCCESS);
@@ -214,7 +237,7 @@ int main(int argc, char *argv[])
        if (ret < 0)
                goto out;
        if (conf.buffer_tree_given) {
-               ret = main_btr(argc, argv);
+               ret = main_btr();
                goto out;
        }
        stdin_set_defaults(sit);
@@ -236,7 +259,6 @@ int main(int argc, char *argv[])
        s.default_timeout.tv_sec = 1;
        s.default_timeout.tv_usec = 0;
        ret = schedule(&s);
-       free_filter_confs();
        close_filters(fc);
 out:
        free(sit->buf);