Simplify ggo makefile.

[paraslash.git] / amp_filter.c

diff --git a/amp_filter.c b/amp_filter.c
index 2c833d656c859ff2b36a9c67295681ff9a92c429..dd2c61949da4877a88ef4ca468fb6bf4be7e6b7e 100644 (file)
--- 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"
@@ -39,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)
@@ -119,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);
 }
 
 /**
@@ -136,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;