X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=amp_filter.c;h=e43e45f78386ee2957929aa3e09ad73ea90fd0c4;hp=78a70f972f0ae58a1c10f14d6d032847a14c1536;hb=3a6b996d8b39fdc067df352d1eee757ef2a8f49b;hpb=ac3371140ad3047476b6bc0f479d11cbdf60ffc5

diff --git a/amp_filter.c b/amp_filter.c
index 78a70f97..e43e45f7 100644
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2014 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -58,13 +58,13 @@ static void amp_open(struct filter_node *fn)
 		sscanf(stat_item_values[SI_AMPLIFICATION], "%u", &pad->amp);
 	else
 		pad->amp = conf->amp_arg;
-	PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n",
+	PARA_INFO_LOG("amplification: %u (scaling factor: %1.2f)\n",
 		pad->amp, pad->amp / 64.0 + 1.0);
 }
 
-static int amp_post_select(__a_unused struct sched *s, struct task *t)
+static int amp_post_select(__a_unused struct sched *s, void *context)
 {
-	struct filter_node *fn = container_of(t, struct filter_node, task);
+	struct filter_node *fn = context;
 	struct private_amp_data *pad = fn->private_data;
 	struct btr_node *btrn = fn->btrn;
 	int ret, factor = 64 + pad->amp;
@@ -73,7 +73,7 @@ static int amp_post_select(__a_unused struct sched *s, struct task *t)
 	bool inplace = btr_inplace_ok(btrn);
 
 	if (pad->amp == 0) { /* no amplification */
-		btr_splice_out_node(btrn);
+		btr_splice_out_node(&fn->btrn);
 		return -E_AMP_ZERO_AMP;
 	}
 next_buffer:
@@ -134,12 +134,8 @@ void amp_filter_init(struct filter *f)
 	f->open = amp_open;
 	f->close = amp_close;
 	f->pre_select = generic_filter_pre_select;
-	f->new_post_select = amp_post_select;
-	f->post_select = NULL;
+	f->post_select = amp_post_select;
 	f->parse_config = amp_parse_config;
 	f->free_config = amp_free_config;
-	f->help = (struct ggo_help) {
-		.short_help = amp_filter_args_info_help,
-		.detailed_help = amp_filter_args_info_detailed_help
-	};
+	f->help = (struct ggo_help)DEFINE_GGO_HELP(amp_filter);
 }