X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=wav_filter.c;h=e749160d3337e87dc7c908c023ea100c955590e4;hb=HEAD;hp=eb38cd7d9626cc9be41957e2f6a04619503bb891;hpb=1f12ea375358a0b30689e01efe82796ea4fcb14f;p=paraslash.git

diff --git a/wav_filter.c b/wav_filter.c
index eb38cd7d..de4a3e6a 100644
--- a/wav_filter.c
+++ b/wav_filter.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file wav_filter.c A filter that inserts a wave header. */
 
@@ -57,12 +53,12 @@ static void wav_open(struct filter_node *fn)
 {
 	int *bof;
 
-	fn->private_data = para_malloc(sizeof(int));
+	fn->private_data = alloc(sizeof(int));
 	bof = fn->private_data;
 	*bof = 1;
 }
 
-static void wav_pre_select(struct sched *s, void *context)
+static void wav_pre_monitor(struct sched *s, void *context)
 {
 	struct filter_node *fn = context;
 	size_t iqs = btr_get_input_queue_size(fn->btrn);
@@ -72,7 +68,7 @@ static void wav_pre_select(struct sched *s, void *context)
 	sched_min_delay(s);
 }
 
-static int wav_post_select(__a_unused struct sched *s, void *context)
+static int wav_post_monitor(__a_unused struct sched *s, void *context)
 {
 	struct filter_node *fn = context;
 	struct btr_node *btrn = fn->btrn;
@@ -82,7 +78,7 @@ static int wav_post_select(__a_unused struct sched *s, void *context)
 	int32_t rate, ch;
 
 	if (iqs == 0) {
-		ret = -E_WAV_EOF;
+		ret = -E_EOF;
 		if (btr_no_parent(btrn))
 			goto err;
 		return 0;
@@ -105,7 +101,7 @@ static int wav_post_select(__a_unused struct sched *s, void *context)
 	free(buf);
 	if (ret < 0)
 		goto err;
-	header = para_malloc(WAV_HEADER_LEN);
+	header = alloc(WAV_HEADER_LEN);
 	make_wav_header(ch, rate, header);
 	btr_add_output(header, WAV_HEADER_LEN, btrn);
 	ret = -E_WAV_SUCCESS;
@@ -122,6 +118,6 @@ err:
 const struct filter lsg_filter_cmd_com_wav_user_data = {
 	.close = wav_close,
 	.open = wav_open,
-	.pre_select = wav_pre_select,
-	.post_select = wav_post_select,
+	.pre_monitor = wav_pre_monitor,
+	.post_monitor = wav_post_monitor,
 };