X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=b07d39130bb2dcc8026ffe93cd9e0d5e2ccbf2d0;hp=2f1fb787814742ed4d503612b0728d5d8158aaa4;hb=082265c336da9b3fb576224beef4e96c72ca3f9c;hpb=f7feafeef70ad8f4e8c6fff715a2287f3240e759 diff --git a/oggdec_filter.c b/oggdec_filter.c index 2f1fb787..b07d3913 100644 --- a/oggdec_filter.c +++ b/oggdec_filter.c @@ -11,7 +11,6 @@ #include #include "para.h" -#include "oggdec_filter.cmdline.h" #include "list.h" #include "sched.h" #include "ggo.h" @@ -237,36 +236,6 @@ out: } } -static int oggdec_parse_config(int argc, char **argv, void **config) -{ - int ret; - struct oggdec_filter_args_info *ogg_conf; - - ogg_conf = para_calloc(sizeof(*ogg_conf)); - ret = -E_OGGDEC_SYNTAX; - if (oggdec_cmdline_parser(argc, argv, ogg_conf)) - goto err; - ret = -ERRNO_TO_PARA_ERROR(EINVAL); - if (ogg_conf->bufsize_arg < 0) - goto err; - if (ogg_conf->bufsize_arg >= INT_MAX / 1024) - goto err; - if (ogg_conf->initial_buffer_arg < 0) - goto err; - if (ogg_conf->initial_buffer_arg >= INT_MAX / 1024) - goto err; - *config = ogg_conf; - return 1; -err: - free(ogg_conf); - return ret; -} - -static void oggdec_free_config(void *conf) -{ - oggdec_cmdline_parser_free(conf); -} - /** * The init function of the ogg vorbis decoder. * @@ -274,18 +243,9 @@ static void oggdec_free_config(void *conf) */ void oggdec_filter_init(struct filter *f) { - struct oggdec_filter_args_info dummy; - - oggdec_cmdline_parser_init(&dummy); f->open = ogg_open; f->close = ogg_close; f->pre_select = generic_filter_pre_select; f->post_select = ogg_post_select; - f->parse_config = oggdec_parse_config; - f->free_config = oggdec_free_config; f->execute = oggdec_execute; - f->help = (struct ggo_help) { - .short_help = oggdec_filter_args_info_help, - .detailed_help = oggdec_filter_args_info_detailed_help - }; }