/*
- * Copyright (C) 2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2013 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 <stdbool.h>
#include "para.h"
#include "amp_filter.cmdline.h"
/** Data specific to the amplify filter. */
struct private_amp_data {
- /** Points to the configuration data for this instance of this filter. */
- struct amp_filter_args_info *conf;
/** Amplification factor. */
unsigned amp;
};
static int amp_parse_config(int argc, char **argv, void **config)
{
- struct amp_filter_args_info *amp_conf = para_calloc(sizeof(*amp_conf));
+ struct amp_filter_args_info *conf = para_calloc(sizeof(*conf));
int ret = -E_AMP_SYNTAX;
- if (amp_cmdline_parser(argc, argv, amp_conf))
- goto err;
+ amp_filter_cmdline_parser(argc, argv, conf);
ret = -ERRNO_TO_PARA_ERROR(EINVAL);
- if (amp_conf->amp_arg < 0)
+ if (conf->amp_arg < 0)
goto err;
- *config = amp_conf;
+ *config = conf;
return 1;
err:
- free(amp_conf);
+ free(conf);
return ret;
}
static void amp_open(struct filter_node *fn)
{
struct private_amp_data *pad = para_calloc(sizeof(*pad));
+ struct amp_filter_args_info *conf = fn->conf;
- pad->conf = fn->conf;
fn->private_data = pad;
fn->min_iqs = 2;
- if (!pad->conf->amp_given && stat_item_values[SI_AMPLIFICATION])
+ if (!conf->amp_given && stat_item_values[SI_AMPLIFICATION])
sscanf(stat_item_values[SI_AMPLIFICATION], "%u", &pad->amp);
else
- pad->amp = pad->conf->amp_arg;
+ pad->amp = conf->amp_arg;
PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n",
pad->amp, pad->amp / 64.0 + 1.0);
}
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);
}
/**
{
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;