X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=amp_filter.c;h=2edfdd5879913ab9c66c8146e81e5c6a508f257f;hb=9eaa22ecdafa718fc2a84a70d442c829ae7e1b34;hp=2c833d656c859ff2b36a9c67295681ff9a92c429;hpb=d9d83772fbee853857f1904fa6553f06a026108c;p=paraslash.git

diff --git a/amp_filter.c b/amp_filter.c
index 2c833d65..2edfdd58 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"
@@ -24,7 +23,6 @@ extern char *stat_item_values[NUM_STAT_ITEMS];
 /** Data specific to the amplify filter. */
 struct private_amp_data {
 	/** Points to the configuration data for this instance of this filter. */
-	struct amp_filter_args_info *conf;
 	/** Amplification factor. */
 	unsigned amp;
 };
@@ -39,7 +37,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)
@@ -54,14 +52,14 @@ err:
 static void amp_open(struct filter_node *fn)
 {
 	struct private_amp_data *pad = para_calloc(sizeof(*pad));
+	struct amp_filter_args_info *conf = fn->conf;
 
-	pad->conf = fn->conf;
 	fn->private_data = pad;
 	fn->min_iqs = 2;
-	if (!pad->conf->amp_given && stat_item_values[SI_AMPLIFICATION])
+	if (!conf->amp_given && stat_item_values[SI_AMPLIFICATION])
 		sscanf(stat_item_values[SI_AMPLIFICATION], "%u", &pad->amp);
 	else
-		pad->amp = pad->conf->amp_arg;
+		pad->amp = conf->amp_arg;
 	PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n",
 		pad->amp, pad->amp / 64.0 + 1.0);
 }
@@ -119,12 +117,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);
 }
 
 /**
@@ -136,7 +134,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;