X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=0ff92e6f72c76d5bf0ac3996aa7923c8d61f502a;hp=f412dc6d3b5e30ed5514eaacd6f6c6add0e419cc;hb=74c88020bd325865fe26ed25ea8ad0ace0924136;hpb=c77e19b4568a32923c0fe43503a4266363056a41

diff --git a/audiod.c b/audiod.c
index f412dc6d..0ff92e6f 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.new_post_select = f->new_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.new_post_select = r->new_post_select;
 	sprintf(rn->task.status, "%s receiver node", r->name);
 	register_task(&sched, &rn->task);
 	return slot_num;
@@ -1022,7 +1010,6 @@ 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;
 	sprintf(st->task.status, "signal task");
 }
 
@@ -1056,7 +1043,6 @@ static void init_command_task(struct command_task *ct)
 {
 	ct->task.pre_select = command_pre_select;
 	ct->task.new_post_select = command_post_select;
-	ct->task.post_select = NULL;
 	ct->task.error = 0;
 	ct->fd = audiod_get_socket(); /* doesn't return on errors */
 	sprintf(ct->task.status, "command task");
@@ -1287,7 +1273,6 @@ static void init_status_task(struct status_task *st)
 	memset(st, 0, sizeof(struct status_task));
 	st->task.pre_select = status_pre_select;
 	st->task.new_post_select = status_post_select;
-	st->task.post_select = NULL;
 	st->sa_time_diff_sign = 1;
 	st->clock_diff_count = conf.clock_diff_count_arg;
 	st->current_audio_format_num = -1;