X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=amp_filter.c;h=5193d7c166d9345ced27899e38714ddd5d393fcf;hp=dddc0a85c3c11f29294074c9b6d565729dfc6e98;hb=2b12fc963d15219721dd23eb7947bf516f2ad574;hpb=282a5e463090205ef8a12f50a9ecf6498b860e88 diff --git a/amp_filter.c b/amp_filter.c index dddc0a85..5193d7c1 100644 --- a/amp_filter.c +++ b/amp_filter.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2013 Andre Noll + * Copyright (C) 2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -34,7 +34,7 @@ static void amp_close(struct filter_node *fn) static int amp_parse_config(int argc, char **argv, void **config) { struct amp_filter_args_info *conf = para_calloc(sizeof(*conf)); - int ret = -E_AMP_SYNTAX; + int ret; amp_filter_cmdline_parser(argc, argv, conf); ret = -ERRNO_TO_PARA_ERROR(EINVAL); @@ -62,9 +62,9 @@ static void amp_open(struct filter_node *fn) 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: