* It has to to take into account that probably the stream was not started at
* the beginning of the file, that the clock between the server and the client
* host may differ and that playback of the stream was delayed, e.g. because
- * the prebuffer filter is used in the filter chain of the given slot.
+ * the prebuffer filter is used in the filter configuration of the given slot.
*
* If no writer is active in the given slot, or \a slot_num is negative
* (indicating that para_audiod runs in standby mode), an approximation based
para_fd_set(st->fd, &s->rfds, &s->max_fileno);
}
- static void signal_post_select(struct sched *s, struct task *t)
+ static void signal_post_select(struct sched *s, __a_unused struct task *t)
{
- struct signal_task *st = container_of(t, struct signal_task, task);
-
- if (!FD_ISSET(st->fd, &s->rfds))
- return;
+ int signum;
- st->signum = para_next_signal();
- switch (st->signum) {
+ signum = para_next_signal(&s->rfds);
+ switch (signum) {
case SIGINT:
case SIGTERM:
case SIGHUP:
- PARA_EMERG_LOG("terminating on signal %d\n", st->signum);
+ PARA_EMERG_LOG("terminating on signal %d\n", signum);
clean_exit(EXIT_FAILURE, "caught deadly signal");
}
}
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();
#define WAV_FILTER_ERRORS \
- PARA_ERROR(WAV_BAD_FC, "invalid filter chain configuration"), \
+ PARA_ERROR(WAV_BAD_FC, "invalid filter configuration"), \
PARA_ERROR(WAV_EOF, "wav filter: end of file"), \
PARA_ERROR(WAV_SUCCESS, "successfully wrote wav header"), \
PARA_ERROR(SENDMSG, "sendmsg() failed"), \
PARA_ERROR(RECVMSG, "recvmsg() failed"), \
PARA_ERROR(SCM_CREDENTIALS, "did not receive SCM credentials"), \
- PARA_ERROR(RECV_PATTERN, "did not receive expected pattern"), \
#define UDP_RECV_ERRORS \
#define FD_ERRORS \
PARA_ERROR(FGETS, "fgets error"), \
+ PARA_ERROR(EOF, "end of file"), \
+ PARA_ERROR(READ_PATTERN, "did not read expected pattern"), \
#define WRITE_ERRORS \