X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=1ba12689b45d7b41d3e2a8b1a8c06464114211a6;hp=3b68857328b230877e2f8cd9061fb07ee789902c;hb=f23669d91a09066b7ecd7b07a74bea8fad61ad39;hpb=e2eebf654cae2fc004cee516a0e165127c0214ca

diff --git a/filter.c b/filter.c
index 3b688573..1ba12689 100644
--- a/filter.c
+++ b/filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -24,6 +24,12 @@
 /** The list of all status items used by para_{server,audiod,gui}. */
 const char *status_item_list[] = {STATUS_ITEM_ARRAY};
 
+/**
+ * Dummy version which only contains NULL pointers.
+ *
+ * This is used by the amp filter which first tries to obtain the amplification
+ * value from an element in this array.
+ */
 char *stat_item_values[NUM_STAT_ITEMS] = {NULL};
 
 /** Initialize the array of errors for para_filter. */
@@ -100,7 +106,7 @@ int main(int argc, char *argv[])
 {
 	static struct sched s;
 	int i, ret;
-	struct filter *f;
+	const struct filter *f;
 	struct btr_node *parent;
 	struct filter_node **fns;
 
@@ -112,13 +118,13 @@ int main(int argc, char *argv[])
 		goto out;
 	sit->btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.name = "stdin"));
-	stdin_set_defaults(sit);
-	register_task(&s, &sit->task);
+	stdin_task_register(sit, &s);
 
 	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;
+		struct task_info ti;
 
 		fn = fns[i] = para_calloc(sizeof(*fn));
 		ret = check_filter_arg(fa, &fn->conf);
@@ -127,32 +133,33 @@ int main(int argc, char *argv[])
 			goto out_cleanup;
 		}
 		fn->filter_num = ret;
-		f = filters + fn->filter_num;
-		sprintf(fn->task.status, "%s", f->name);
+		f = filter_get(fn->filter_num);
 		PARA_DEBUG_LOG("filter #%d: %s\n", i, f->name);
 		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;
+		ti.name = f->name;
+		ti.pre_select = f->pre_select;
+		ti.post_select = f->post_select;
+		ti.context = fn;
 		f->open(fn);
-		register_task(&s, &fn->task);
+		fn->task = task_register(&ti, &s);
 		parent = fn->btrn;
 	}
 	sot->btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.name = "stdout", .parent = parent));
-	stdout_set_defaults(sot);
-	register_task(&s, &sot->task);
+	stdout_task_register(sot, &s);
 
 	s.default_timeout.tv_sec = 1;
 	s.default_timeout.tv_usec = 0;
 	btr_log_tree(sit->btrn, LL_INFO);
 	ret = schedule(&s);
+	sched_shutdown(&s);
 out_cleanup:
 	for (i--; i >= 0; i--) {
 		struct filter_node *fn = fns[i];
 
-		f = filters + fn->filter_num;
+		f = filter_get(fn->filter_num);
 		if (f->close)
 			f->close(fn);
 		btr_remove_node(&fn->btrn);