X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=b07d39130bb2dcc8026ffe93cd9e0d5e2ccbf2d0;hp=edd33c1db88e6add8f84677fce75bc0ff825334a;hb=082265c336da9b3fb576224beef4e96c72ca3f9c;hpb=e8089cd5efad59a5eec689117acf563a38b8c6c7

diff --git a/oggdec_filter.c b/oggdec_filter.c
index edd33c1d..b07d3913 100644
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -11,7 +11,6 @@
 #include <stdbool.h>
 
 #include "para.h"
-#include "oggdec_filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
@@ -199,19 +198,15 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 	struct filter_node *fn = container_of(t, struct filter_node, task);
 	struct private_oggdec_data *pod = fn->private_data;
 	struct btr_node *btrn = fn->btrn;
-	size_t iqs, len;
-	int ret;
-	char *in;
+	int ret, ns;
 
 	pod->converted = 0;
 	t->error = 0;
-	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
-	if (ret <= 0)
-		goto out;
-	btr_merge(btrn, fn->min_iqs);
-	len = btr_next_buffer(btrn, &in);
-	iqs = btr_get_input_queue_size(btrn);
+	ret = ns = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
 	if (!pod->vf) {
+		if (ret <= 0)
+			goto out;
+		btr_merge(btrn, fn->min_iqs);
 		ret = ogg_init(fn);
 		if (ret <= 0)
 			goto out;
@@ -224,15 +219,8 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 		pod->converted = 0;
 		if (read_ret <= 0)
 			free(out);
-		if (read_ret == 0) {
-			if (btr_no_parent(btrn))
-				ret = -E_OGGDEC_EOF;
-			else
-				ret = 0;
-			goto out;
-		}
-		ret = 0;
-		if (read_ret == OV_HOLE)
+		ret = ns;
+		if (read_ret == 0 || read_ret == OV_HOLE)
 			goto out;
 		ret = -E_OGGDEC_BADLINK;
 		if (read_ret < 0)
@@ -248,36 +236,6 @@ out:
 	}
 }
 
-static int oggdec_parse_config(int argc, char **argv, void **config)
-{
-	int ret;
-	struct oggdec_filter_args_info *ogg_conf;
-
-	ogg_conf = para_calloc(sizeof(*ogg_conf));
-	ret = -E_OGGDEC_SYNTAX;
-	if (oggdec_cmdline_parser(argc, argv, ogg_conf))
-		goto err;
-	ret = -ERRNO_TO_PARA_ERROR(EINVAL);
-	if (ogg_conf->bufsize_arg < 0)
-		goto err;
-	if (ogg_conf->bufsize_arg >= INT_MAX / 1024)
-		goto err;
-	if (ogg_conf->initial_buffer_arg < 0)
-		goto err;
-	if (ogg_conf->initial_buffer_arg >= INT_MAX / 1024)
-		goto err;
-	*config = ogg_conf;
-	return 1;
-err:
-	free(ogg_conf);
-	return ret;
-}
-
-static void oggdec_free_config(void *conf)
-{
-	oggdec_cmdline_parser_free(conf);
-}
-
 /**
  * The init function of the ogg vorbis decoder.
  *
@@ -285,18 +243,9 @@ static void oggdec_free_config(void *conf)
  */
 void oggdec_filter_init(struct filter *f)
 {
-	struct oggdec_filter_args_info dummy;
-
-	oggdec_cmdline_parser_init(&dummy);
 	f->open = ogg_open;
 	f->close = ogg_close;
 	f->pre_select = generic_filter_pre_select;
 	f->post_select = ogg_post_select;
-	f->parse_config = oggdec_parse_config;
-	f->free_config = oggdec_free_config;
 	f->execute = oggdec_execute;
-	f->help = (struct ggo_help) {
-		.short_help = oggdec_filter_args_info_help,
-		.detailed_help = oggdec_filter_args_info_detailed_help
-	};
 }