server: Convert non-afs commands to lopsub.

[paraslash.git] / amp_filter.c

diff --git a/amp_filter.c b/amp_filter.c
index a6bfca25acd3126562d14a198e64ac1459a1b988..5193d7c166d9345ced27899e38714ddd5d393fcf 100644 (file)
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2009-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009 Andre Noll <maan@tuebingen.mpg.de>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
  *
  * 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));
 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);
 
        amp_filter_cmdline_parser(argc, argv, conf);
        ret = -ERRNO_TO_PARA_ERROR(EINVAL);


@@ -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;
                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);
 }
 
                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;
        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 */
        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:
                return -E_AMP_ZERO_AMP;
        }
 next_buffer:


@@ -137,8 +137,5 @@ void amp_filter_init(struct filter *f)
        f->post_select = amp_post_select;
        f->parse_config = amp_parse_config;
        f->free_config = amp_free_config;
        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);

 }
 }