X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=mp3dec_filter.c;h=d40df85edbe24b9dc54f01fc9305a1575c022507;hb=ed0b4c07d3dee1c2a3c250ec11ba58839671c934;hp=75b052755e22eb09a9abfc977217907eff2a6f63;hpb=27c08870ba172782f6406045007b6ff32a4f7329;p=paraslash.git

diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index 75b05275..d40df85e 100644
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@ -73,7 +73,7 @@ static void mp3dec_close(struct filter_node *fn)
 
 #define MP3DEC_MAX_FRAME 8192
 
-static int mp3dec_post_select(__a_unused struct sched *s, void *context)
+static int mp3dec_post_monitor(__a_unused struct sched *s, void *context)
 {
 	struct filter_node *fn = context;
 	int i, ret;
@@ -93,7 +93,7 @@ next_buffer:
 	btr_merge(btrn, fn->min_iqs);
 	len = btr_next_buffer(btrn, &inbuffer);
 	/*
-	 * Decode at most 8K in one go to give the post_select() functions of
+	 * Decode at most 8K in one go to give the post_monitor() functions of
 	 * other buffer tree nodes a chance to run. This is necessary to avoid
 	 * buffer underruns on slow machines.
 	 */
@@ -105,7 +105,7 @@ next_frame:
 		mp3dec_consume(btrn, &pmd->stream, len);
 		if (pmd->stream.error == MAD_ERROR_BUFLEN) {
 			if (len == iqs && btr_no_parent(btrn)) {
-				ret = -E_MP3DEC_EOF;
+				ret = -E_EOF;
 				goto err;
 			}
 			fn->min_iqs += 100;
@@ -127,7 +127,7 @@ decode:
 			goto err;
 		mad_stream_sync(&pmd->stream);
 		if (pmd->stream.error == MAD_ERROR_BUFLEN) {
-			ret = -E_MP3DEC_EOF;
+			ret = -E_EOF;
 			if (len == iqs && btr_no_parent(btrn))
 				goto err;
 			fn->min_iqs += 100;
@@ -187,7 +187,7 @@ static int mp3dec_execute(struct btr_node *btrn, const char *cmd, char **result)
 const struct filter lsg_filter_cmd_com_mp3dec_user_data = {
 	.open = mp3dec_open,
 	.close = mp3dec_close,
-	.pre_select = generic_filter_pre_select,
-	.post_select = mp3dec_post_select,
+	.pre_monitor = generic_filter_pre_monitor,
+	.post_monitor = mp3dec_post_monitor,
 	.execute = mp3dec_execute,
 };