X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=compress_filter.c;h=7bad4c25debac02e16f2df75a6f98530fd666e3b;hp=6034ce790276c7bbcb8d35312e717394e10f5098;hb=5587494468627e20fe622b6055689717262d09ab;hpb=dd0b1f12758ac877de6834b34f8c7f9291d4311d;ds=sidebyside

diff --git a/compress_filter.c b/compress_filter.c
index 6034ce79..7bad4c25 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.
  */
@@ -10,10 +10,13 @@
  * Uses ideas of AudioCompress, (C) 2002-2004  M. Hari Nezumi <magenta@trikuare.cx>
  */
 
+#include <regex.h>
+
 #include "para.h"
 #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 +24,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 +35,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)
@@ -52,7 +53,7 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
 		/* be careful in that heat, my dear */
 		int sample = *ip++, adjusted_sample = (PARA_ABS(sample) *
 			pcd->current_gain) >> gain_shift;
-		if (unlikely(adjusted_sample > 32767)) { /* clip */
+		if (adjusted_sample > 32767) { /* clip */
 			PARA_NOTICE_LOG("clip: sample: %d, adjusted sample: %d\n",
 				sample, adjusted_sample);
 			adjusted_sample = 32767;
@@ -62,7 +63,7 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
 		} else
 			pcd->peak = PARA_MAX(pcd->peak, adjusted_sample);
 		*op++ = sample >= 0? adjusted_sample : -adjusted_sample;
-		if (likely(++pcd->num_samples & mask))
+		if (++pcd->num_samples & mask)
 			continue;
 //		PARA_DEBUG_LOG("gain: %u, peak: %u\n", pcd->current_gain,
 //			pcd->peak);
@@ -71,7 +72,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 +121,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
+	};
 }