Merge branch 't/doc'

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index 4858366e697973f52d9e20495e16072422632249..8e117e9277e7480cb92bd3e33ff9fe5fbd925b0f 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file audiod.c the paraslash's audio daemon */
+/** \file audiod.c The paraslash's audio daemon. */
 #include <regex.h>
 #include <sys/types.h>
 #include <signal.h>
@@ -77,6 +77,12 @@ enum vss_status_flags {
        VSS_STATUS_FLAG_PLAYING = 2,
 };
 
+/**
+ * The scheduler instance of para_audiod.
+ *
+ * This is needed also in audiod_command.c (for the tasks command), so it can
+ * not be made static.
+ */
 struct sched sched = {.max_fileno = 0};
 
 /**
@@ -918,8 +924,10 @@ static int parse_filter_args(void)
 {
        int i, j, ret, af_mask;
 
-       if (!conf.no_default_filters_given)
-               return init_default_filters();
+       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);