Merge branch 't/remove_no_default_filters'

We have printed a warning for several month if this option was
still used. This should be enough.

diff --git a/NEWS b/NEWS
index dfe779eed74299064a1f0648b364781244a2ccda..0ac2240effe91e4294c8ec901fe18f9c143e42d3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,11 @@
 -------------------------------------------
-0.4.11 (to be announced "mutual diversity")
+0.4.11 (to be announced) "mutual diversity"
 -------------------------------------------
 
+       - The --no_default_filters option of para_filter has been
+         removed.
        - Documentation improvements.
+
 ------------------------------------------
 0.4.10 (2012-03-30) "heterogeneous vacuum"
 ------------------------------------------
@@ -14,7 +17,7 @@ improvements and the usual mix of cleanups and fixes.
          deprecated. It still works but has no effect and will be
          removed in the next version.
        - para_gui now prints also the stderr output of the executing
-          command in the bottom window.
+         command in the bottom window.
        - Cleanup and consolidation of the various wrappers for
          write(), writev(), send() and friends.
        - The obscure error messages on mmap() failures have been

diff --git a/audiod.c b/audiod.c
index 8e117e9277e7480cb92bd3e33ff9fe5fbd925b0f..aefac612b480af2d6f1c857b5225f3d042b68ff4 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -924,10 +924,6 @@ static int parse_filter_args(void)
 {
        int i, j, ret, af_mask;
 
-       if (conf.no_default_filters_given) {
-               PARA_WARNING_LOG("--no_default_filters is deprecated\n");
-               PARA_WARNING_LOG("It has no effect and will be removed soon\n");
-       }
        for (i = 0; i < conf.filter_given; i++) {
                char *arg;
                ret = parse_stream_command(conf.filter_arg[i], &arg);

diff --git a/ggo/audiod.m4 b/ggo/audiod.m4
index 1bc5db14e5ec35bb6de27bed651ac66da76c2713..9aabd575b0519cc5f763219e135c3726c6e38611 100644 (file)
--- a/ggo/audiod.m4
+++ b/ggo/audiod.m4
@@ -142,15 +142,6 @@ details="
 
 "
 
-option "no_default_filters" D
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-"deprecated"
-flag off
-details = "
-       This option is was deprecated in paraslash-0.4.10 and has no
-       effect any more. It will be removed in the next version.
-"
-
 option "filter" f
 #~~~~~~~~~~~~~~~~
 "Specify the filter configuration."