From: Andre Noll <maan@systemlinux.org>
Date: Sun, 31 Mar 2013 13:11:46 +0000 (+0000)
Subject: amp: Switch to the alternative post select method.
X-Git-Tag: v0.4.13~39^2~37
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=ac3371140ad3047476b6bc0f479d11cbdf60ffc5

amp: Switch to the alternative post select method.
---

diff --git a/amp_filter.c b/amp_filter.c
index 90b5660d..78a70f97 100644
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -62,7 +62,7 @@ static void amp_open(struct filter_node *fn)
 		pad->amp, pad->amp / 64.0 + 1.0);
 }
 
-static void amp_post_select(__a_unused struct sched *s, struct task *t)
+static int amp_post_select(__a_unused struct sched *s, struct task *t)
 {
 	struct filter_node *fn = container_of(t, struct filter_node, task);
 	struct private_amp_data *pad = fn->private_data;
@@ -73,16 +73,15 @@ static void amp_post_select(__a_unused struct sched *s, struct task *t)
 	bool inplace = btr_inplace_ok(btrn);
 
 	if (pad->amp == 0) { /* no amplification */
-		t->error = -E_AMP_ZERO_AMP;
 		btr_splice_out_node(btrn);
-		return;
+		return -E_AMP_ZERO_AMP;
 	}
 next_buffer:
 	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
 	if (ret < 0)
 		goto err;
 	if (ret == 0)
-		return;
+		return 0;
 	btr_merge(btrn, fn->min_iqs);
 	in_bytes = btr_next_buffer(btrn, (char **)&in);
 	len = in_bytes / 2;
@@ -110,12 +109,11 @@ next_buffer:
 		btr_consume(btrn, len * 2);
 		btr_add_output((char *)out, len * 2, btrn);
 	}
-	t->error = 0;
 	goto next_buffer;
 err:
 	assert(ret < 0);
-	t->error = ret;
 	btr_remove_node(&fn->btrn);
+	return ret;
 }
 
 static void amp_free_config(void *conf)
@@ -136,7 +134,8 @@ void amp_filter_init(struct filter *f)
 	f->open = amp_open;
 	f->close = amp_close;
 	f->pre_select = generic_filter_pre_select;
-	f->post_select = amp_post_select;
+	f->new_post_select = amp_post_select;
+	f->post_select = NULL;
 	f->parse_config = amp_parse_config;
 	f->free_config = amp_free_config;
 	f->help = (struct ggo_help) {