Use sideband also for challenge response.

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index 295787262ae66589ceb6dc2d56da258e77943ef8..aefac612b480af2d6f1c857b5225f3d042b68ff4 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -1,14 +1,13 @@
 /*
- * 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>
-#include <stdbool.h>
 
 #include "para.h"
 #include "error.h"
@@ -78,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};
 
 /**
@@ -919,8 +924,6 @@ static int parse_filter_args(void)
 {
        int i, j, ret, af_mask;
 
-       if (!conf.no_default_filters_given)
-               return init_default_filters();
        for (i = 0; i < conf.filter_given; i++) {
                char *arg;
                ret = parse_stream_command(conf.filter_arg[i], &arg);
@@ -1160,7 +1163,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)