X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=d2c66f2bfe5f5bd0d8ba1da88b048ad21d9ceb00;hb=484e75562df55dca31ffcb9e5b05a490b4a3d3a1;hp=41be3c4f757c64e200c1e6772f82bac6cbe56d9b;hpb=a7f2d19821d3251298364b8a45d5c5f7bf9d5baa;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index 41be3c4f..d2c66f2b 100644
--- a/audiod.c
+++ b/audiod.c
@@ -495,13 +495,7 @@ static void open_filters(struct slot_info *s)
 		fn->filter_num = a->filter_nums[i];
 		fn->conf = a->filter_conf[i];
 		fn->task.pre_select = f->pre_select;
-		if (f->new_post_select) {
-			fn->task.new_post_select = f->new_post_select;
-			fn->task.post_select = NULL;
-		} else {
-			fn->task.new_post_select = NULL;
-			fn->task.post_select = f->post_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));
@@ -565,13 +559,7 @@ static int open_receiver(int format)
 	PARA_NOTICE_LOG("started %s: %s receiver in slot %d\n",
 		audio_formats[format], r->name, slot_num);
 	rn->task.pre_select = r->pre_select;
-	if (r->new_post_select) {
-		rn->task.new_post_select = r->new_post_select;
-		rn->task.post_select = NULL;
-	} else {
-		rn->task.new_post_select = NULL;
-		rn->task.post_select = r->post_select;
-	}
+	rn->task.post_select = r->post_select;
 	sprintf(rn->task.status, "%s receiver node", r->name);
 	register_task(&sched, &rn->task);
 	return slot_num;
@@ -1021,8 +1009,7 @@ static int signal_post_select(struct sched *s, __a_unused struct task *t)
 static void signal_setup_default(struct signal_task *st)
 {
 	st->task.pre_select = signal_pre_select;
-	st->task.new_post_select = signal_post_select;
-	st->task.post_select = NULL;
+	st->task.post_select = signal_post_select;
 	sprintf(st->task.status, "signal task");
 }
 
@@ -1032,7 +1019,7 @@ static void command_pre_select(struct sched *s, struct task *t)
 	para_fd_set(ct->fd, &s->rfds, &s->max_fileno);
 }
 
-static void command_post_select(struct sched *s, struct task *t)
+static int command_post_select(struct sched *s, struct task *t)
 {
 	int ret;
 	struct command_task *ct = container_of(t, struct command_task, task);
@@ -1049,13 +1036,13 @@ static void command_post_select(struct sched *s, struct task *t)
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	audiod_status_dump();
+	return 0;
 }
 
 static void init_command_task(struct command_task *ct)
 {
 	ct->task.pre_select = command_pre_select;
 	ct->task.post_select = command_post_select;
-	ct->task.new_post_select = NULL;
 	ct->task.error = 0;
 	ct->fd = audiod_get_socket(); /* doesn't return on errors */
 	sprintf(ct->task.status, "command task");
@@ -1205,7 +1192,7 @@ min_delay:
 }
 
 /* restart the client task if necessary */
-static void status_post_select(struct sched *s, struct task *t)
+static int status_post_select(struct sched *s, struct task *t)
 {
 	struct status_task *st = container_of(t, struct status_task, task);
 
@@ -1278,6 +1265,7 @@ static void status_post_select(struct sched *s, struct task *t)
 	st->last_status_read = *now;
 out:
 	start_stop_decoders();
+	return 0;
 }
 
 static void init_status_task(struct status_task *st)