X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=d7765e21c4224d8ff2419f45521effb62cd50492;hp=88411af46616879040a8691308ed4ca639fc5475;hb=88c5dc601a5d1b194da3102566a3fb97947a6aee;hpb=85094cd802bdb606d4e2bf7ed66dec51db2a0953

diff --git a/audiod.c b/audiod.c
index 88411af4..d7765e21 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>
@@ -918,8 +918,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 +1161,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)