X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aacdec_filter.c;h=87a7900af3ee9b43e1a661d66cdd54d1625b0952;hb=9055c71be97f1095dcdbd83da305b600f204f763;hp=a2459d82b31991a8e9ac578e0559a398c83f4e10;hpb=2031b9cab9304b02c0372f73eef54d9501277031;p=paraslash.git

diff --git a/aacdec_filter.c b/aacdec_filter.c
index a2459d82..87a7900a 100644
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -52,7 +52,7 @@ static int aacdec_execute(struct btr_node *btrn, const char *cmd, char **result)
 static void aacdec_open(struct filter_node *fn)
 {
 	NeAACDecConfigurationPtr c;
-	struct private_aacdec_data *padd = para_calloc(sizeof(*padd));
+	struct private_aacdec_data *padd = zalloc(sizeof(*padd));
 
 	padd->handle = NeAACDecOpen();
 	c = NeAACDecGetCurrentConfiguration(padd->handle);
@@ -74,7 +74,7 @@ static void aacdec_close(struct filter_node *fn)
 	fn->private_data = NULL;
 }
 
-static int aacdec_post_select(__a_unused struct sched *s, void *context)
+static int aacdec_post_monitor(__a_unused struct sched *s, void *context)
 {
 	struct filter_node *fn = context;
 	struct btr_node *btrn = fn->btrn;
@@ -136,7 +136,7 @@ next_buffer:
 	consumed += frame_info.bytesconsumed;
 	if (!frame_info.samples)
 		goto success;
-	btrbuf = para_malloc(2 * frame_info.samples);
+	btrbuf = arr_alloc(2, frame_info.samples);
 	for (i = 0; i < frame_info.samples; i++) {
 		short sh = ((short *)outbuf)[i];
 		write_int16_host_endian(btrbuf + loaded, sh);
@@ -158,7 +158,7 @@ err:
 const struct filter lsg_filter_cmd_com_aacdec_user_data = {
 	.open = aacdec_open,
 	.close = aacdec_close,
-	.pre_select = generic_filter_pre_select,
-	.post_select = aacdec_post_select,
+	.pre_monitor = generic_filter_pre_monitor,
+	.post_monitor = aacdec_post_monitor,
 	.execute = aacdec_execute
 };