X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=amp_filter.c;h=be69ad67a8d78d419f3147546785130e42c7b80b;hb=refs%2Fheads%2Fnext;hp=61b1653ea069ce479b6b609da5703fc57bc717c1;hpb=d31995b3074bb19aa4da66ce5c4774ca9ed101a1;p=paraslash.git

diff --git a/amp_filter.c b/amp_filter.c
index 61b1653e..be69ad67 100644
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -29,7 +29,7 @@ static void amp_close(struct filter_node *fn)
 
 static void amp_open(struct filter_node *fn)
 {
-	struct private_amp_data *pad = para_calloc(sizeof(*pad));
+	struct private_amp_data *pad = zalloc(sizeof(*pad));
 	unsigned given = FILTER_CMD_OPT_GIVEN(AMP, AMP, fn->lpr);
 	uint32_t amp_arg = FILTER_CMD_OPT_UINT32_VAL(AMP, AMP, fn->lpr);
 
@@ -43,7 +43,7 @@ static void amp_open(struct filter_node *fn)
 		pad->amp, pad->amp / 64.0 + 1.0);
 }
 
-static int amp_post_select(__a_unused struct sched *s, void *context)
+static int amp_post_monitor(__a_unused struct sched *s, void *context)
 {
 	struct filter_node *fn = context;
 	struct private_amp_data *pad = fn->private_data;
@@ -67,14 +67,14 @@ next_buffer:
 	in_bytes = btr_next_buffer(btrn, (char **)&in);
 	len = in_bytes / 2;
 	if (len == 0) { /* eof and in_bytes == 1 */
-		ret = -E_AMP_EOF;
+		ret = -E_EOF;
 		goto err;
 	}
 
 	if (inplace)
 		out = in;
 	else
-		out = para_malloc(len * 2);
+		out = alloc(len * 2);
 
 	for (i = 0; i < len; i++) {
 		int x = (in[i] * factor) >> 6;
@@ -100,6 +100,6 @@ err:
 const struct filter lsg_filter_cmd_com_amp_user_data = {
 	.open = amp_open,
 	.close = amp_close,
-	.pre_select = generic_filter_pre_select,
-	.post_select = amp_post_select,
+	.pre_monitor = generic_filter_pre_monitor,
+	.post_monitor = amp_post_monitor,
 };