X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=1d8cc4c1a76c7622a59abd1de2b4b7c678bc4925;hb=a713c13d1089170828403e98c57d3fba9aedf9a4;hp=4b88ec5bba61c53be43e901edbae2bc8c7c84a5e;hpb=8bf35b38357c3ce59f52ae87f6e84e4b6d183ac7;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index 4b88ec5b..1d8cc4c1 100644
--- a/audiod.c
+++ b/audiod.c
@@ -408,6 +408,7 @@ static void writer_cleanup(struct writer_node *wn)
 	PARA_INFO_LOG("closing %s\n", writer_names[wn->writer_num]);
 	w->close(wn);
 	btr_remove_node(&wn->btrn);
+	task_reap(&wn->task);
 }
 
 static void close_writers(struct slot_info *s)
@@ -445,6 +446,7 @@ static void close_filters(struct slot_info *s)
 		if (f->close)
 			f->close(fn);
 		btr_remove_node(&fn->btrn);
+		task_reap(&fn->task);
 	}
 	free(s->fns);
 	s->fns = NULL;
@@ -498,22 +500,26 @@ static void open_filters(struct slot_info *s)
 	s->fns = para_calloc(nf * sizeof(struct filter_node));
 	parent = s->receiver_node->btrn;
 	for (i = 0; i < nf; i++) {
+		char buf[20];
 		struct filter *f = filters + a->filter_nums[i];
 		fn = s->fns + i;
 		fn->filter_num = a->filter_nums[i];
 		fn->conf = a->filter_conf[i];
-		fn->task.pre_select = f->pre_select;
-		fn->task.post_select = f->post_select;
 		fn->btrn = btr_new_node(&(struct btr_node_description)
 			EMBRACE(.name = f->name, .parent = parent,
 				.handler = f->execute, .context = fn));
 
 		f->open(fn);
-		register_task(&sched, &fn->task);
+		sprintf(buf, "%s (slot %d)", f->name, (int)(s - slot));
+		fn->task = task_register(&(struct task_info) {
+			.name = buf,
+			.pre_select = f->pre_select,
+			.post_select = f->post_select,
+			.context = fn,
+		}, &sched);
 		parent = fn->btrn;
 		PARA_NOTICE_LOG("%s filter %d/%d (%s) started in slot %d\n",
 			audio_formats[s->format], i,  nf, f->name, (int)(s - slot));
-		sprintf(fn->task.status, "%s (slot %d)", f->name, (int)(s - slot));
 	}
 }
 
@@ -1109,14 +1115,14 @@ static bool must_close_slot(int slot_num)
 	if (s->receiver_node && s->receiver_node->task->error >= 0)
 		return false;
 	for (i = 0; i < a->num_filters; i++)
-		if (s->fns && s->fns[i].task.error >= 0)
+		if (s->fns && s->fns[i].task->error >= 0)
 			return false;
 	if (a->num_writers > 0) {
 		for (i = 0; i < a->num_writers; i++)
-			if (s->wns && s->wns[i].task.error >= 0)
+			if (s->wns && s->wns[i].task->error >= 0)
 				return false;
 	} else {
-		if (s->wns && s->wns[0].task.error >= 0)
+		if (s->wns && s->wns[0].task->error >= 0)
 			return false;
 	}
 	return true;