X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=amp_filter.c;h=61b1653ea069ce479b6b609da5703fc57bc717c1;hp=3dc1e4117938f0c07d67f519e3cf076a51f4d52c;hb=f932f45196a8a4480ad910c455abe8aae9824967;hpb=9de1287d67c9562e9140c6dc7deb0c01c4e10cc0

diff --git a/amp_filter.c b/amp_filter.c
index 3dc1e411..61b1653e 100644
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -1,18 +1,14 @@
-/*
- * Copyright (C) 2009-2012 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2009 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file amp_filter.c Paraslash's amplify filter. */
 
 #include <regex.h>
+#include <lopsub.h>
 
+#include "filter_cmd.lsg.h"
 #include "para.h"
-#include "amp_filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
-#include "ggo.h"
 #include "buffer_tree.h"
 #include "filter.h"
 #include "string.h"
@@ -22,8 +18,6 @@ extern char *stat_item_values[NUM_STAT_ITEMS];
 
 /** 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;
 };
@@ -33,41 +27,25 @@ static void amp_close(struct filter_node *fn)
 	free(fn->private_data);
 }
 
-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))
-		goto err;
-	ret = -ERRNO_TO_PARA_ERROR(EINVAL);
-	if (amp_conf->amp_arg < 0)
-		goto err;
-	*config = amp_conf;
-	return 1;
-err:
-	free(amp_conf);
-	return ret;
-}
-
 static void amp_open(struct filter_node *fn)
 {
 	struct private_amp_data *pad = para_calloc(sizeof(*pad));
+	unsigned given = FILTER_CMD_OPT_GIVEN(AMP, AMP, fn->lpr);
+	uint32_t amp_arg = FILTER_CMD_OPT_UINT32_VAL(AMP, AMP, fn->lpr);
 
-	pad->conf = fn->conf;
 	fn->private_data = pad;
 	fn->min_iqs = 2;
-	if (!pad->conf->amp_given && stat_item_values[SI_AMPLIFICATION])
-		sscanf(stat_item_values[SI_AMPLIFICATION], "%u", &pad->amp);
+	if (!given && stat_item_values[SI_amplification])
+		sscanf(stat_item_values[SI_amplification], "%u", &pad->amp);
 	else
-		pad->amp = pad->conf->amp_arg;
-	PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n",
+		pad->amp = amp_arg;
+	PARA_INFO_LOG("amplification: %u (scaling factor: %1.2f)\n",
 		pad->amp, pad->amp / 64.0 + 1.0);
 }
 
-static void 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;
@@ -76,16 +54,15 @@ static void amp_post_select(__a_unused struct sched *s, struct task *t)
 	bool inplace = btr_inplace_ok(btrn);
 
 	if (pad->amp == 0) { /* no amplification */
-		t->error = -E_AMP_ZERO_AMP;
-		btr_splice_out_node(btrn);
-		return;
+		btr_splice_out_node(&fn->btrn);
+		return -E_AMP_ZERO_AMP;
 	}
 next_buffer:
 	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
 	if (ret < 0)
 		goto err;
 	if (ret == 0)
-		return;
+		return 0;
 	btr_merge(btrn, fn->min_iqs);
 	in_bytes = btr_next_buffer(btrn, (char **)&in);
 	len = in_bytes / 2;
@@ -113,37 +90,16 @@ next_buffer:
 		btr_consume(btrn, len * 2);
 		btr_add_output((char *)out, len * 2, btrn);
 	}
-	t->error = 0;
 	goto next_buffer;
 err:
 	assert(ret < 0);
-	t->error = ret;
-	btr_remove_node(btrn);
-}
-
-static void amp_free_config(void *conf)
-{
-	amp_cmdline_parser_free(conf);
+	btr_remove_node(&fn->btrn);
+	return ret;
 }
 
-/**
- * The init function of the amplify filter.
- *
- * \param f Pointer to the struct to initialize.
- */
-void amp_filter_init(struct filter *f)
-{
-	struct amp_filter_args_info dummy;
-
-	amp_cmdline_parser_init(&dummy);
-	f->open = amp_open;
-	f->close = amp_close;
-	f->pre_select = generic_filter_pre_select;
-	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
-	};
-}
+const struct filter lsg_filter_cmd_com_amp_user_data = {
+	.open = amp_open,
+	.close = amp_close,
+	.pre_select = generic_filter_pre_select,
+	.post_select = amp_post_select,
+};