X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=f0d450a6ee49ea784c226aa1b8ae04bff6ce0b95;hp=cc4164fead07425382e539f90261dead037c6279;hb=8dab386f;hpb=4b260054e8b8c03de7ffdc96b879ceb2be1a1122 diff --git a/audiod.c b/audiod.c index cc4164fe..f0d450a6 100644 --- a/audiod.c +++ b/audiod.c @@ -1023,9 +1023,7 @@ static void command_post_select(struct sched *s, struct task *t) last_status_dump = *now; } - if (!FD_ISSET(ct->fd, &s->rfds)) - return; - ret = handle_connect(ct->fd); + ret = handle_connect(ct->fd, &s->rfds); if (ret < 0) PARA_ERROR_LOG("%s\n", para_strerror(-ret)); audiod_status_dump(); @@ -1152,7 +1150,9 @@ static void status_pre_select(struct sched *s, struct task *t) ret = btr_node_status(st->btrn, 0, BTR_NT_LEAF); if (ret > 0) goto min_delay; - if (!st->ct) + if (st->ct && audiod_status == AUDIOD_OFF) + goto min_delay; + if (!st->ct && audiod_status != AUDIOD_OFF) sched_request_barrier_or_min_delay(&st->restart_barrier, s); if (cafn >= 0) sched_request_barrier(&afi[cafn].restart_barrier, s);