Add btr support to filter code.

[paraslash.git] / filter.c

diff --git a/filter.c b/filter.c
index 20ea1333b758b4302774a1c075980072d6ebf208..45f4bff099873be853cd2bf1f38d7327b9496822 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -14,6 +14,7 @@
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"

+#include "buffer_tree.h"

 #include "filter.h"
 #include "string.h"
 #include "stdin.h"
 #include "filter.h"
 #include "string.h"
 #include "stdin.h"


@@ -154,9 +155,41 @@ static int parse_config(int argc, char *argv[])
 }
 
 /* TODO: support more than one filter, actually parse options */
 }
 
 /* TODO: support more than one filter, actually parse options */

-static int main_btr(void)
+static int __noreturn main_btr(int argc, char *argv[])

 {
 {

-       return 42;
+       static struct sched s;
+       struct filter_node *fn = para_calloc(sizeof(*fn));
+       int ret;
+       struct filter *f;
+
+       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);
+       stdout_set_defaults(sot);
+       register_task(&sot->task);
+
+       s.default_timeout.tv_sec = 1;
+       s.default_timeout.tv_usec = 0;
+       ret = schedule(&s);
+err:
+       free(fn);
+       if (ret < 0)
+               PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+       exit(ret < 0? EXIT_FAILURE : EXIT_SUCCESS);

 }
 
 /**
 }
 
 /**


@@ -181,7 +214,7 @@ int main(int argc, char *argv[])
        if (ret < 0)
                goto out;
        if (conf.buffer_tree_given) {
        if (ret < 0)
                goto out;
        if (conf.buffer_tree_given) {

-               ret = main_btr();
+               ret = main_btr(argc, argv);

                goto out;
        }
        stdin_set_defaults(sit);
                goto out;
        }
        stdin_set_defaults(sit);