Remove oggdec_filter.ggo.

The two options are no longer used.

diff --git a/NEWS b/NEWS
index c17a543bb249024ebd55aa1abf4876a324ee5e0a..0d74d5ee5c9762039e38239070ec638e04b37d6c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ NEWS
        - Fix an end-of-file detection bug in the oggdec filter.
        - New user manual
        - The new nonblock API
+       - Both options of the oggdec filter have been removed.
 
 ------------------------------------------
 0.4.2 (2010-04-23) "associative expansion"

diff --git a/configure.ac b/configure.ac
index 80eaf095372b8bcd1663254b380e5203085bf53c..d8f55ce26c5967cf16075323283db93cae7da98c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -456,9 +456,6 @@ if test "$have_ogg" = "yes"; then
        audiod_ldflags="$audiod_ldflags $oggvorbis_libs -lvorbis -lvorbisfile"
        afh_ldflags="$afh_ldflags $oggvorbis_libs -logg -lvorbis -lvorbisfile"
 
-       filter_cmdline_objs="$filter_cmdline_objs add_cmdline(oggdec_filter)"
-       audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(oggdec_filter)"
-
        server_errlist_objs="$server_errlist_objs ogg_afh"
        filter_errlist_objs="$filter_errlist_objs oggdec_filter"
        audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"

diff --git a/ggo/oggdec_filter.ggo b/ggo/oggdec_filter.ggo
deleted file mode 100644 (file)
index e2d653d..0000000
--- a/ggo/oggdec_filter.ggo
+++ /dev/null
@@ -1,21 +0,0 @@
-option "bufsize" b
-#~~~~~~~~~~~~~~~~~
-"size of output buffer"
-int typestr="kilobyte"
-default="128"
-optional
-details="
-       Increase this if you encounter output buffer overrun errors. Smaller
-       values make the oggdec filter use less memory.
-"
-
-option "initial_buffer" i
-#~~~~~~~~~~~~~~~~~~~~~~~~
-"size of initial input buffer"
-int typestr="kilobyte"
-default="16"
-optional
-details="
-       On startup, defer decoding until that many kilobytes are
-       available in the input buffer.
-"

diff --git a/oggdec_filter.c b/oggdec_filter.c
index 2f1fb787814742ed4d503612b0728d5d8158aaa4..b07d39130bb2dcc8026ffe93cd9e0d5e2ccbf2d0 100644 (file)
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -11,7 +11,6 @@
 #include <stdbool.h>
 
 #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
-       };
 }