X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=spxdec_filter.c;h=08eac02a557b2d503646666edd7ffb35e1c5c5f7;hb=9055c71be97f1095dcdbd83da305b600f204f763;hp=7be817ddaa49bf97e5d4025c43be63b42da9cd4c;hpb=3622134825eb94882a8e99acc0ee1889fc0169d6;p=paraslash.git

diff --git a/spxdec_filter.c b/spxdec_filter.c
index 7be817dd..08eac02a 100644
--- a/spxdec_filter.c
+++ b/spxdec_filter.c
@@ -81,7 +81,7 @@ struct private_spxdec_data {
 
 static void spxdec_open(struct filter_node *fn)
 {
-	struct private_spxdec_data *psd = para_calloc(sizeof(*psd));
+	struct private_spxdec_data *psd = zalloc(sizeof(*psd));
 
 	fn->private_data = psd;
 	fn->min_iqs = 200;
@@ -171,7 +171,7 @@ static int speexdec_write_frames(int packet_no,
 		if (new_frame_size <= 0)
 			continue;
 		samples = new_frame_size * psd->shi.channels;
-		btr_output = para_malloc(2 * samples);
+		btr_output = arr_alloc(samples, 2);
 		for (i = 0; i < samples; i++)
 			btr_output[i] = read_u16(output + i + skip_idx);
 		btr_add_output((char *)btr_output, samples * 2, btrn);
@@ -246,7 +246,7 @@ static int compute_skip_samples(ogg_page *og, struct private_spxdec_data *psd)
 	return ret;
 }
 
-static int speexdec_post_select(__a_unused struct sched *s, void *context)
+static int speexdec_post_monitor(__a_unused struct sched *s, void *context)
 {
 	struct filter_node *fn = context;
 	struct private_spxdec_data *psd = fn->private_data;
@@ -305,7 +305,7 @@ fail:
 const struct filter lsg_filter_cmd_com_spxdec_user_data = {
 	.open = spxdec_open,
 	.close = speexdec_close,
-	.pre_select = generic_filter_pre_select,
-	.post_select = speexdec_post_select,
+	.pre_monitor = generic_filter_pre_monitor,
+	.post_monitor = speexdec_post_monitor,
 	.execute = speexdec_execute,
 };