X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=flacdec_filter.c;h=f3060f5721c1c22753cceb4229ee4dbe178dbf52;hb=be5daec66f163725489f42d512659a8af5c3fd59;hp=6a3a8effaf83b3b9e333e429762f0ff2d3938afe;hpb=d31995b3074bb19aa4da66ce5c4774ca9ed101a1;p=paraslash.git

diff --git a/flacdec_filter.c b/flacdec_filter.c
index 6a3a8eff..f3060f57 100644
--- a/flacdec_filter.c
+++ b/flacdec_filter.c
@@ -135,7 +135,7 @@ static FLAC__StreamDecoderWriteStatus write_cb(
 	struct btr_node *btrn = fn->btrn;
 	size_t k, n = frame->header.blocksize;
 	unsigned channels = FLAC__stream_decoder_get_channels(decoder);
-	char *outbuffer = para_malloc(n * channels * 2);
+	char *outbuffer = arr_alloc(n, channels * 2);
 
 	if (channels == 1) {
 		for (k = 0; k < n; k++) {
@@ -205,7 +205,7 @@ static bool output_queue_full(struct btr_node *btrn)
 	return btr_get_output_queue_size(btrn) > FLACDEC_MAX_OUTPUT_SIZE;
 }
 
-static void flacdec_pre_select(struct sched *s, void *context)
+static void flacdec_pre_monitor(struct sched *s, void *context)
 {
 	struct filter_node *fn = context;
 	struct private_flacdec_data *pfd = fn->private_data;
@@ -221,7 +221,7 @@ static void flacdec_pre_select(struct sched *s, void *context)
 		return sched_min_delay(s);
 }
 
-static int flacdec_post_select(__a_unused struct sched *s, void *context)
+static int flacdec_post_monitor(__a_unused struct sched *s, void *context)
 {
 	struct filter_node *fn = context;
 	struct private_flacdec_data *pfd = fn->private_data;
@@ -286,7 +286,7 @@ static void flacdec_close(struct filter_node *fn)
 
 static void flacdec_open(struct filter_node *fn)
 {
-	struct private_flacdec_data *pfd = para_calloc(sizeof(*pfd));
+	struct private_flacdec_data *pfd = zalloc(sizeof(*pfd));
 	fn->private_data = pfd;
 	fn->min_iqs = 0;
 }
@@ -294,7 +294,7 @@ static void flacdec_open(struct filter_node *fn)
 const struct filter lsg_filter_cmd_com_flacdec_user_data = {
 	.open = flacdec_open,
 	.close = flacdec_close,
-	.pre_select = flacdec_pre_select,
-	.post_select = flacdec_post_select,
+	.pre_monitor = flacdec_pre_monitor,
+	.post_monitor = flacdec_post_monitor,
 	.execute = flacdec_execute,
 };