X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=a8e2429ce0f8a659492e3f29fcf4d504318fce4d;hp=3b5f2d193f31ddc1d8c130703637810f807f255f;hb=4744d937c4160898d1fe151257606430750e580c;hpb=eb992f2fc3ff5b6bd1c0b91d473b07675fe5b927

diff --git a/write.c b/write.c
index 3b5f2d19..a8e2429c 100644
--- a/write.c
+++ b/write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "string.h"
@@ -186,7 +185,7 @@ __noreturn static void print_help_and_die(void)
  * \return Standard.
  */
 static void setup_writer_node(const char *arg, struct btr_node *parent,
-		struct writer_node *wn)
+		struct writer_node *wn, struct sched *s)
 {
 	if (arg)
 		wn->conf = check_writer_arg_or_die(arg, &wn->writer_num);
@@ -194,7 +193,7 @@ static void setup_writer_node(const char *arg, struct btr_node *parent,
 		wn->writer_num = DEFAULT_WRITER;
 		wn->conf = writers[DEFAULT_WRITER].parse_config_or_die("");
 	}
-	register_writer_node(wn, parent);
+	register_writer_node(wn, parent, s);
 }
 
 static int setup_and_schedule(void)
@@ -208,7 +207,7 @@ static int setup_and_schedule(void)
 	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);
 
 	cwt->state = CWS_NEED_HEADER;
 	cwt->min_iqs = WAV_HEADER_LEN;
@@ -219,17 +218,17 @@ static int setup_and_schedule(void)
 	cwt->task.pre_select = check_wav_pre_select;
 	cwt->task.post_select = check_wav_post_select;
 	cwt->task.error = 0;
-	register_task(&cwt->task);
+	register_task(&s, &cwt->task);
 
 	if (!conf.writer_given) {
 		wns = para_calloc(sizeof(*wns));
-		setup_writer_node(NULL, cwt->btrn, wns);
+		setup_writer_node(NULL, cwt->btrn, wns, &s);
 		i = 1;
 	} else {
 		wns = para_calloc(conf.writer_given * sizeof(*wns));
 		for (i = 0; i < conf.writer_given; i++)
 			setup_writer_node(conf.writer_arg[i], cwt->btrn,
-				wns + i);
+				wns + i, &s);
 	}
 
 	s.default_timeout.tv_sec = 10;