X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=81258a6a12b51459d21ec00bad628bae009fa015;hp=08398d591250013054efdc1cf0d192cb88a981e3;hb=e83cbfdcc9f5671cab0b1dae5cb81b956d0ab5ce;hpb=e35be295c787fae6e79d35a18a70e988a982b3df

diff --git a/filter.c b/filter.c
index 08398d59..81258a6a 100644
--- a/filter.c
+++ b/filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,7 +7,6 @@
 /** \file filter.c The stand-alone filter program. */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "filter.cmdline.h"
@@ -20,6 +19,7 @@
 #include "stdin.h"
 #include "stdout.h"
 #include "error.h"
+#include "version.h"
 
 /** The list of all status items used by para_{server,audiod,gui}. */
 const char *status_item_list[] = {STATUS_ITEM_ARRAY};
@@ -116,9 +116,10 @@ int main(int argc, char *argv[])
 	ret = parse_config(argc, argv);
 	if (ret < 0)
 		goto out;
-	sit->btrn = btr_new_node("stdin", NULL, NULL, NULL);
+	sit->btrn = btr_new_node(&(struct btr_node_description)
+		EMBRACE(.name = "stdin"));
 	stdin_set_defaults(sit);
-	register_task(&sit->task);
+	register_task(&s, &sit->task);
 
 	fns = para_malloc(conf.filter_given * sizeof(*fns));
 	for (i = 0, parent = sit->btrn; i < conf.filter_given; i++) {
@@ -135,16 +136,19 @@ int main(int argc, char *argv[])
 		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->btrn = btr_new_node(&(struct btr_node_description)
+			EMBRACE(.name = f->name, .parent = parent,
+			.handler = f->execute, .context = fn));
 		fn->task.pre_select = f->pre_select;
 		fn->task.post_select = f->post_select;
 		f->open(fn);
-		register_task(&fn->task);
+		register_task(&s, &fn->task);
 		parent = fn->btrn;
 	}
-	sot->btrn = btr_new_node("stdout", parent, NULL, NULL);
+	sot->btrn = btr_new_node(&(struct btr_node_description)
+		EMBRACE(.name = "stdout", .parent = parent));
 	stdout_set_defaults(sot);
-	register_task(&sot->task);
+	register_task(&s, &sot->task);
 
 	s.default_timeout.tv_sec = 1;
 	s.default_timeout.tv_usec = 0;