Merge commit 'fml/master' into next
[paraslash.git] / amp_filter.c
index f6e2205..63b1b9a 100644 (file)
@@ -1,11 +1,13 @@
 /*
- * Copyright (C) 2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file amp_filter.c Paraslash's amplify filter. */
 
+#include <regex.h>
+
 #include "para.h"
 #include "amp_filter.cmdline.h"
 #include "list.h"
@@ -76,11 +78,9 @@ static void amp_open(struct filter_node *fn)
 
        pad->conf = fn->conf;
        fn->private_data = pad;
-       if (!pad->conf->amp_given && stat_item_values[SI_AMPLIFICATION]) {
-               int i = SI_AMPLIFICATION;
-               char *s = stat_item_values[i] + strlen(status_item_list[i]) + 1;
-               sscanf(s, "%u", &pad->amp);
-       } else
+       if (!pad->conf->amp_given && stat_item_values[SI_AMPLIFICATION])
+               sscanf(stat_item_values[SI_AMPLIFICATION], "%u", &pad->amp);
+       else
                pad->amp = pad->conf->amp_arg;
        fn->bufsize = AMP_CHUNK_SIZE;
        fn->buf = para_malloc(fn->bufsize);
@@ -101,8 +101,6 @@ void amp_filter_init(struct filter *f)
        f->convert = amp_convert;
        f->parse_config = amp_parse_config;
        f->help = (struct ggo_help) {
-               .purpose = amp_filter_args_info_purpose,
-               .usage = amp_filter_args_info_usage,
                .short_help = amp_filter_args_info_help,
                .detailed_help = amp_filter_args_info_detailed_help
        };