X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=8e117e9277e7480cb92bd3e33ff9fe5fbd925b0f;hb=460bc598cfeabcdbf7f249061be5af82fd5a4ea9;hp=88411af46616879040a8691308ed4ca639fc5475;hpb=d16fe3df649cb48d5ffa26187da3dad4c3066646;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index 88411af4..8e117e92 100644
--- 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);
@@ -1159,7 +1167,7 @@ static void status_pre_select(struct sched *s, struct task *t)
 
 	if (must_start_decoder())
 		goto min_delay;
-	ret = btr_node_status(st->btrn, 0, BTR_NT_LEAF);
+	ret = btr_node_status(st->btrn, st->min_iqs, BTR_NT_LEAF);
 	if (ret > 0)
 		goto min_delay;
 	if (st->ct && audiod_status == AUDIOD_OFF)