X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=compress_filter.c;h=65bc8e51ba0f3fe11126b53e04b774e70dd9872d;hp=6034ce790276c7bbcb8d35312e717394e10f5098;hb=03d45daad787b8f2ced3070e80c4550bf4b02931;hpb=d9e608504d9d0e71380907559546e211c4f0ce55

diff --git a/compress_filter.c b/compress_filter.c
index 6034ce79..65bc8e51 100644
--- a/compress_filter.c
+++ b/compress_filter.c
@@ -1,5 +1,5 @@
 /*
- * 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.
  */
@@ -14,6 +14,7 @@
 #include "compress_filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "filter.h"
 #include "string.h"
 #include "error.h"
@@ -21,8 +22,6 @@
 /** The size of the output data buffer. */
 #define COMPRESS_CHUNK_SIZE 40960
 
-extern char *stat_item_values[NUM_STAT_ITEMS];
-
 /** Data specific to the compress filter. */
 struct private_compress_data {
 	/** The current multiplier. */
@@ -34,7 +33,7 @@ struct private_compress_data {
 	/** Number of samples already seen. */
 	unsigned num_samples;
 	/** Absolute value of the maximal sample in the current block. */
-	unsigned peak;
+	int peak;
 };
 
 static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
@@ -71,7 +70,7 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
 				pcd->current_gain++;
 		} else
 			pcd->current_gain = PARA_MAX(pcd->current_gain - 2,
-				1 << pcd->conf->inertia_arg);
+				1U << pcd->conf->inertia_arg);
 		pcd->peak = 0;
 	}
 	fn->loaded += length;
@@ -120,9 +119,15 @@ static void open_compress(struct filter_node *fn)
  */
 void compress_filter_init(struct filter *f)
 {
+	struct compress_filter_args_info dummy;
+
+	compress_cmdline_parser_init(&dummy);
 	f->open = open_compress;
 	f->close = close_compress;
 	f->convert = compress;
-	f->print_help = compress_cmdline_parser_print_help;
 	f->parse_config = compress_parse_config;
+	f->help = (struct ggo_help) {
+		.short_help = compress_filter_args_info_help,
+		.detailed_help = compress_filter_args_info_detailed_help
+	};
 }