X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=amp_filter.c;h=dd2c61949da4877a88ef4ca468fb6bf4be7e6b7e;hp=5e58212dacee5daacad0209805ef2591684f9855;hb=46af7dd81149caee0409535d5d9884ed9fa5af0e;hpb=e49c1a0bf9c48dfd597eb082fadf728a34d870b0

diff --git a/amp_filter.c b/amp_filter.c
index 5e58212d..dd2c6194 100644
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,7 +7,6 @@
 /** \file amp_filter.c Paraslash's amplify filter. */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "amp_filter.cmdline.h"
@@ -19,9 +18,6 @@
 #include "string.h"
 #include "error.h"
 
-/** The size of the output data buffer. */
-#define AMP_CHUNK_SIZE 40960
-
 extern char *stat_item_values[NUM_STAT_ITEMS];
 
 /** Data specific to the amplify filter. */
@@ -35,7 +31,6 @@ struct private_amp_data {
 static void amp_close(struct filter_node *fn)
 {
 	free(fn->private_data);
-	free(fn->buf);
 }
 
 static int amp_parse_config(int argc, char **argv, void **config)
@@ -43,7 +38,7 @@ static int amp_parse_config(int argc, char **argv, void **config)
 	struct amp_filter_args_info *amp_conf = para_calloc(sizeof(*amp_conf));
 	int ret = -E_AMP_SYNTAX;
 
-	if (amp_cmdline_parser(argc, argv, amp_conf))
+	if (amp_filter_cmdline_parser(argc, argv, amp_conf))
 		goto err;
 	ret = -ERRNO_TO_PARA_ERROR(EINVAL);
 	if (amp_conf->amp_arg < 0)
@@ -66,8 +61,6 @@ static void amp_open(struct filter_node *fn)
 		sscanf(stat_item_values[SI_AMPLIFICATION], "%u", &pad->amp);
 	else
 		pad->amp = pad->conf->amp_arg;
-	fn->bufsize = AMP_CHUNK_SIZE;
-	fn->buf = para_malloc(fn->bufsize);
 	PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n",
 		pad->amp, pad->amp / 64.0 + 1.0);
 }
@@ -125,12 +118,12 @@ next_buffer:
 err:
 	assert(ret < 0);
 	t->error = ret;
-	btr_remove_node(btrn);
+	btr_remove_node(&fn->btrn);
 }
 
 static void amp_free_config(void *conf)
 {
-	amp_cmdline_parser_free(conf);
+	amp_filter_cmdline_parser_free(conf);
 }
 
 /**
@@ -142,7 +135,7 @@ void amp_filter_init(struct filter *f)
 {
 	struct amp_filter_args_info dummy;
 
-	amp_cmdline_parser_init(&dummy);
+	amp_filter_cmdline_parser_init(&dummy);
 	f->open = amp_open;
 	f->close = amp_close;
 	f->pre_select = generic_filter_pre_select;