X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=oggdec_filter.c;h=b1aec4bc2c4cb0049ed942d3b7e7708b2de84688;hb=refs%2Fheads%2Fnext;hp=b05691c3f57ac60efc430f6518b077ed7697e0a9;hpb=26a032fffa6c6e6f092ed3d14c2b5f08e5c736d6;p=paraslash.git

diff --git a/oggdec_filter.c b/oggdec_filter.c
index b05691c3..91c18c48 100644
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -107,7 +107,8 @@ static void ogg_close(struct filter_node *fn)
 	fn->private_data = NULL;
 }
 
-static int oggdec_execute(struct btr_node *btrn, const char *cmd, char **result)
+static int oggdec_execute(const struct btr_node *btrn, const char *cmd,
+		char **result)
 {
 	struct filter_node *fn = btr_context(btrn);
 	struct private_oggdec_data *pod = fn->private_data;
@@ -178,13 +179,13 @@ out:
 
 /**
   * Allocate chunks of this size and produce at most one chunk of output per
-  * ->post_select() invocation. If the buffer could only be filled partially
+  * ->post_monitor() invocation. If the buffer could only be filled partially
   * due to insufficient input being available, it is shrunk to the real output
   * size and the resized buffer is fed into the output queue.
   */
 #define OGGDEC_OUTPUT_CHUNK_SIZE (32 * 1024)
 
-static void ogg_pre_select(struct sched *s, void *context)
+static void ogg_pre_monitor(struct sched *s, void *context)
 {
 	struct filter_node *fn = context;
 	struct private_oggdec_data *pod = fn->private_data;
@@ -201,7 +202,7 @@ static void ogg_pre_select(struct sched *s, void *context)
 	sched_min_delay(s);
 }
 
-static int ogg_post_select(__a_unused struct sched *s, void *context)
+static int ogg_post_monitor(__a_unused struct sched *s, void *context)
 {
 	struct filter_node *fn = context;
 	struct private_oggdec_data *pod = fn->private_data;
@@ -211,7 +212,7 @@ static int ogg_post_select(__a_unused struct sched *s, void *context)
 
 	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
 	if (ret < 0) {
-		if (ret != -E_BTR_EOF) /* fatal error */
+		if (ret != -E_EOF) /* fatal error */
 			goto out;
 		if (fn->min_iqs == 0 && !pod->have_more) /* EOF */
 			goto out;
@@ -262,7 +263,7 @@ out:
 const struct filter lsg_filter_cmd_com_oggdec_user_data = {
 	.open = ogg_open,
 	.close = ogg_close,
-	.pre_select = ogg_pre_select,
-	.post_select = ogg_post_select,
+	.pre_monitor = ogg_pre_monitor,
+	.post_monitor = ogg_post_monitor,
 	.execute = oggdec_execute
 };