X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3dec_filter.c;h=ccb1553b820357e13f2cafe2c0e8a7e0502ac8fd;hp=98627504e22aef64664dade778463404ef641c8b;hb=f932f45196a8a4480ad910c455abe8aae9824967;hpb=e065f3eec9be99d82da855bf3da38d8e86752fef

diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index 98627504..ccb1553b 100644
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@ -1,19 +1,15 @@
-/*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file mp3dec_filter.c Paraslash's mp3 decoder. */
 
 #include <mad.h>
 #include <regex.h>
+#include <lopsub.h>
 
+#include "filter_cmd.lsg.h"
 #include "para.h"
-#include "mp3dec_filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
-#include "ggo.h"
 #include "buffer_tree.h"
 #include "filter.h"
 #include "error.h"
@@ -77,9 +73,9 @@ static void mp3dec_close(struct filter_node *fn)
 
 #define MP3DEC_MAX_FRAME 8192
 
-static int mp3dec_post_select(__a_unused struct sched *s, struct task *t)
+static int mp3dec_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;
 	int i, ret;
 	struct private_mp3dec_data *pmd = fn->private_data;
 	struct btr_node *btrn = fn->btrn;
@@ -171,25 +167,15 @@ err:
 static void mp3dec_open(struct filter_node *fn)
 {
 	struct private_mp3dec_data *pmd = para_calloc(sizeof(*pmd));
-	struct mp3dec_filter_args_info *mp3_conf = fn->conf;
 
 	fn->private_data = pmd;
 	mad_stream_init(&pmd->stream);
 	mad_frame_init(&pmd->frame);
 	mad_synth_init(&pmd->synth);
-	if (mp3_conf->ignore_crc_given)
+	if (FILTER_CMD_OPT_GIVEN(MP3DEC, IGNORE_CRC, fn->lpr))
 		mad_stream_options(&pmd->stream, MAD_OPTION_IGNORECRC);
 }
 
-static int mp3dec_parse_config(int argc, char **argv, void **config)
-{
-	struct mp3dec_filter_args_info *conf = para_calloc(sizeof(*conf));
-
-	mp3dec_filter_cmdline_parser(argc, argv, conf);
-	*config = conf;
-	return 1;
-}
-
 static int mp3dec_execute(struct btr_node *btrn, const char *cmd, char **result)
 {
 	struct filter_node *fn = btr_context(btrn);
@@ -198,31 +184,10 @@ static int mp3dec_execute(struct btr_node *btrn, const char *cmd, char **result)
 	return decoder_execute(cmd, pmd->sample_rate, pmd->channels, result);
 }
 
-static void mp3dec_free_config(void *conf)
-{
-	mp3dec_filter_cmdline_parser_free(conf);
-}
-/**
- * The init function of the mp3dec filter.
- *
- * \param f Pointer to the filter struct to initialize.
- *
- * \sa filter::init.
- */
-void mp3dec_filter_init(struct filter *f)
-{
-	struct mp3dec_filter_args_info dummy;
-
-	mp3dec_filter_cmdline_parser_init(&dummy);
-	f->open = mp3dec_open;
-	f->close = mp3dec_close;
-	f->parse_config = mp3dec_parse_config;
-	f->free_config = mp3dec_free_config;
-	f->pre_select = generic_filter_pre_select;
-	f->post_select = mp3dec_post_select;
-	f->execute = mp3dec_execute;
-	f->help = (struct ggo_help) {
-		.short_help = mp3dec_filter_args_info_help,
-		.detailed_help = mp3dec_filter_args_info_detailed_help
-	};
-}
+const struct filter lsg_filter_cmd_com_mp3dec_user_data = {
+	.open = mp3dec_open,
+	.close = mp3dec_close,
+	.pre_select = generic_filter_pre_select,
+	.post_select = mp3dec_post_select,
+	.execute = mp3dec_execute,
+};