X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=02f04b4809e66864e78e0bde29b8cd0665c6984e;hp=689fc7aac57739ba23989616d4e8cbfb1ed761b1;hb=05ac3a8322555355fac0e224305a4a10a5d7caa2;hpb=d9e608504d9d0e71380907559546e211c4f0ce55

diff --git a/oggdec_filter.c b/oggdec_filter.c
index 689fc7aa..02f04b48 100644
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -1,22 +1,23 @@
 /*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file oggdec_filter.c Paraslash's ogg vorbis decoder. */
 
-#include "para.h"
+#include <regex.h>
+#include <vorbis/vorbisfile.h>
 
+#include "para.h"
 #include "oggdec_filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "filter.h"
 #include "error.h"
 #include "string.h"
 
-#include <vorbis/vorbisfile.h>
-
 /** Determine byte sex. */
 #ifdef WORDS_BIGENDIAN
 #define ENDIAN 1
@@ -124,7 +125,9 @@ static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
 
 	if (!pod->vf) {
 		int ib = 1024 * conf->initial_buffer_arg; /* initial buffer */
-		if (len <ib && !*fn->fc->input_error) {
+		if (*fn->fc->input_error < 0)
+			return *fn->fc->input_error;
+		if (len < ib) {
 			PARA_DEBUG_LOG("initial input buffer %zd/%d, "
 				"waiting for more data\n", len, ib);
 			return 0;
@@ -195,9 +198,15 @@ err:
  */
 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->convert = ogg_convert;
-	f->print_help = oggdec_cmdline_parser_print_help;
 	f->parse_config = oggdec_parse_config;
+	f->help = (struct ggo_help) {
+		.short_help = oggdec_filter_args_info_help,
+		.detailed_help = oggdec_filter_args_info_detailed_help
+	};
 }