/*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** define the array containing all supported audio formats */
const char *audio_formats[] = {AUDIOD_AUDIO_FORMAT_ARRAY NULL};
-/** defines how to handle one supported audio format */
+/** Defines how audiod handles one supported audio format. */
struct audio_format_info {
/** pointer to the receiver for this audio format */
struct receiver *receiver;
int get_audio_format_num(char *name)
{
int i;
+
+ while (para_isspace(*name))
+ name++;
FOR_EACH_AUDIO_FORMAT(i)
if (!strcmp(name, audio_formats[i]))
return i;
if (ll < conf.loglevel_arg)
return;
+ if (!logfile && conf.daemon_given)
+ return;
if (!hostname)
hostname = para_hostname();
outfd = logfile? logfile : stderr;
if (s->format < 0 || !s->receiver_node)
return;
a = &afi[s->format];
- PARA_NOTICE_LOG("closing %s receiver in slot %d (eof = %d)\n",
- audio_formats[s->format] , slot_num, s->receiver_node->eof);
+ PARA_NOTICE_LOG("closing %s receiver in slot %d\n",
+ audio_formats[s->format], slot_num);
a->receiver->close(s->receiver_node);
free(s->receiver_node);
s->receiver_node = NULL;
}
-static void kill_all_decoders(void)
+static void kill_all_decoders(int error)
{
int i;
FOR_EACH_SLOT(i) {
struct slot_info *s = &slot[i];
- if (s->wng && !s->wng->eof) {
+ if (s->wng && !s->wng->error) {
PARA_INFO_LOG("unregistering writer node group in slot %d\n",
i);
wng_unregister(s->wng);
- s->wng->eof = 1;
+ s->wng->error = error;
}
- if (s->fc && !s->fc->eof) {
+ if (s->fc && !s->fc->error) {
PARA_INFO_LOG("unregistering filter chain in slot %d\n", i);
unregister_task(&s->fc->task);
- s->fc->eof = 1;
+ s->fc->error = error;
}
- if (s->receiver_node && !s->receiver_node->eof) {
+ if (s->receiver_node && !s->receiver_node->error) {
PARA_INFO_LOG("unregistering receiver_node in slot %d\n", i);
unregister_task(&s->receiver_node->task);
- s->receiver_node->eof = 1;
+ s->receiver_node->error = error;
}
}
}
static void filter_event_handler(struct task *t)
{
- PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
+ PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
struct filter_chain *fc = t->private_data;
- fc->eof = 1;
+ fc->error = t->ret;
unregister_task(t);
}
INIT_LIST_HEAD(&s->fc->filters);
s->fc->inbuf = s->receiver_node->buf;
s->fc->in_loaded = &s->receiver_node->loaded;
- s->fc->input_eof = &s->receiver_node->eof;
+ s->fc->input_error = &s->receiver_node->error;
s->fc->task.pre_select = filter_pre_select;
s->fc->task.event_handler = filter_event_handler;
s->fc->task.private_data = s->fc;
- s->fc->eof = 0;
+ s->fc->error = 0;
- s->receiver_node->output_eof = &s->fc->eof;
+ s->receiver_node->output_error = &s->fc->error;
sprintf(s->fc->task.status, "filter chain");
for (i = 0; i < nf; i++) {
struct filter_node *fn = para_calloc(sizeof(struct filter_node));
{
struct writer_node_group *wng = t->private_data;
- PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
- wng->eof = 1;
+ PARA_INFO_LOG("%s\n", para_strerror(-t->ret));
+ wng->error = t->ret;
wng_unregister(wng);
}
if (s->fc) {
s->wng->buf = s->fc->outbuf;
s->wng->loaded = s->fc->out_loaded;
- s->wng->input_eof = &s->fc->eof;
+ s->wng->input_error = &s->fc->error;
s->wng->channels = &s->fc->channels;
s->wng->samplerate = &s->fc->samplerate;
- s->fc->output_eof = &s->wng->eof;
+ s->fc->output_error = &s->wng->error;
PARA_INFO_LOG("samplerate: %d\n", *s->wng->samplerate);
} else {
s->wng->buf = s->receiver_node->buf;
s->wng->loaded = &s->receiver_node->loaded;
- s->wng->input_eof = &s->receiver_node->eof;
+ s->wng->input_error = &s->receiver_node->error;
}
s->wng->task.event_handler = wng_event_handler;
for (i = 0; i < a->num_writers; i++) {
}
ret = wng_open(s->wng);
if (ret < 0) {
- PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+ PARA_ERROR_LOG("%s\n", para_strerror(-ret));
return;
}
s->wstime = *now;
static void rn_event_handler(struct task *t)
{
struct receiver_node *rn = t->private_data;
- const struct timeval restart_delay = {0, 10 * 1000};
int i;
- PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
+ PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
unregister_task(t);
- rn->eof = 1;
+ rn->error = t->ret;
/* set restart barrier */
FOR_EACH_SLOT(i) {
+ struct timeval restart_delay = {0, 10 * 1000};
if (slot[i].receiver_node != rn)
continue;
+ if (rn->error != -E_RECV_EOF)
+ /* don't reconnect immediately on errors */
+ restart_delay.tv_sec = 5;
tv_add(now, &restart_delay, &afi[slot[i].format].restart_barrier);
}
}
register_task(&rn->task);
return 1;
err:
- PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+ PARA_ERROR_LOG("%s\n", para_strerror(-ret));
tv_add(now, &restart_delay, &afi[format].restart_barrier);
return ret;
}
FOR_EACH_SLOT(i) {
struct slot_info *s = &slot[i];
if (s->format == format && s->receiver_node
- && !s->receiver_node->eof)
+ && !s->receiver_node->error)
return 1;
}
return 0;
static int open_current_receiver(struct sched *s)
{
- int i;
struct timeval diff;
- char *audio_format = stat_task->stat_item_values[SI_FORMAT];
+ int cafn = stat_task->current_audio_format_num;
- if (!audio_format || !stat_task->pcd)
+ if (cafn < 0 || !stat_task->pcd)
return 0;
- i = get_audio_format_num(audio_format + strlen(
- status_item_list[SI_FORMAT]) + 1);
- if (i < 0)
+ if (receiver_running(cafn))
return 0;
- if (receiver_running(i))
- return 0;
- if (tv_diff(now, &afi[i].restart_barrier, &diff) < 0) {
+ if (tv_diff(now, &afi[cafn].restart_barrier, &diff) < 0) {
s->timeout = diff;
return 0;
}
- return open_receiver(i) < 0? 0 : 1;
+ return open_receiver(cafn) < 0? 0 : 1;
}
static unsigned compute_time_diff(const struct timeval *status_time)
case SI_OFFSET:
stat_task->offset_seconds = atoi(line + ilen + 1);
break;
- case SI_LENGTH:
+ case SI_SECONDS_TOTAL:
stat_task->length_seconds = atoi(line + ilen + 1);
break;
case SI_STREAM_START:
if (stat_task->clock_diff_count)
stat_task->clock_diff_count--;
break;
+ case SI_FORMAT:
+ stat_task->current_audio_format_num = get_audio_format_num(
+ line + ilen + 1);
}
return 1;
}
if (s->format < 0)
return;
- if (s->receiver_node && !s->receiver_node->eof)
+ if (s->receiver_node && !s->receiver_node->error)
return;
- if (s->fc && !s->fc->eof)
+ if (s->fc && !s->fc->error)
return;
- if (s->wng && !s->wng->eof)
+ if (s->wng && !s->wng->error)
return;
- PARA_INFO_LOG("closing slot %d \n", slot_num);
+ PARA_INFO_LOG("closing slot %d\n", slot_num);
wng_close(s->wng);
close_filters(s->fc);
free(s->fc);
/*
* Check if any receivers/filters/writers need to be started and do so if
- * neccessary. Since the pre_select function didn't have a chance yet to put
+ * necessary. Since the pre_select function didn't have a chance yet to put
* file descriptors into the fd sets given by s, make the upcoming select()
* return immediately to avoid a long timeout in case we started something.
*/
t->ret = 1;
if (audiod_status != AUDIOD_ON || !stat_task->playing)
- return kill_all_decoders();
+ return kill_all_decoders(-E_NOT_PLAYING);
if (open_current_receiver(s))
s->timeout = min_delay;
FOR_EACH_SLOT(i) {
a = &afi[sl->format];
if (!sl->receiver_node)
continue;
+ if ((!a->num_filters || sl->fc) && sl->wng)
+ continue; /* everything already started */
if (!a->num_filters) {
if (sl->receiver_node->loaded && !sl->wng) {
open_writers(i);
s->timeout = min_delay;
continue;
}
- if (!sl->fc || !*sl->fc->out_loaded || sl->wng)
+ if (sl->wng || !sl->fc || !*sl->fc->out_loaded)
continue;
if (tv_diff(now, &initial_delay_barrier, &diff) > 0) {
open_writers(i);
return 1;
}
+/* does not unlink socket on errors */
static int audiod_get_socket(void)
{
struct sockaddr_un unix_addr;
- int fd;
+ int ret, fd;
if (conf.socket_given)
socket_name = para_strdup(conf.socket_arg);
PARA_NOTICE_LOG("local socket: %s\n", socket_name);
if (conf.force_given)
unlink(socket_name);
- fd = create_local_socket(socket_name, &unix_addr,
- S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
- if (fd < 0) {
- PARA_EMERG_LOG("can not connect to socket\n");
- exit(EXIT_FAILURE); /* do not unlink socket */
- }
+ ret = create_local_socket(socket_name, &unix_addr,
+ S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
+ if (ret < 0)
+ goto err;
+ fd = ret;
if (listen(fd , 5) < 0) {
- PARA_EMERG_LOG("can not listen on socket\n");
- exit(EXIT_FAILURE); /* do not unlink socket */
+ ret = -ERRNO_TO_PARA_ERROR(errno);
+ goto err;
}
- mark_fd_nonblock(fd);
+ ret = mark_fd_nonblocking(fd);
+ if (ret < 0)
+ goto err;
return fd;
+err:
+ PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+ exit(EXIT_FAILURE);
}
static void signal_event_handler(struct task *t)
return;
ret = handle_connect(ct->fd);
if (ret < 0)
- PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+ PARA_ERROR_LOG("%s\n", para_strerror(-ret));
}
static void init_command_task(struct command_task *ct)
return;
client_close(stat_task->pcd);
stat_task->pcd = NULL;
- for (i = 0; i < NUM_STAT_ITEMS; i++) {
+ FOR_EACH_STATUS_ITEM(i) {
free(stat_task->stat_item_values[i]);
stat_task->stat_item_values[i] = NULL;
}
stat_task->offset_seconds = 0;
audiod_status_dump();
stat_task->playing = 0;
- stat_task->stat_item_values[SI_STATUS_BAR] = make_message(
- "%s:no connection to para_server\n",
- status_item_list[SI_STATUS_BAR]);
- stat_client_write(stat_task->stat_item_values[SI_STATUS_BAR],
- SI_STATUS_BAR);
+ stat_task->stat_item_values[SI_BASENAME] = make_message(
+ "%s: no connection to para_server\n",
+ status_item_list[SI_BASENAME]);
+ stat_client_write(stat_task->stat_item_values[SI_BASENAME],
+ SI_BASENAME);
if (stat_task->clock_diff_count) {
stat_task->clock_diff_barrier.tv_sec = now->tv_sec + 1;
stat_task->clock_diff_barrier.tv_usec = now->tv_usec;
st->task.private_data = st;
st->sa_time_diff_sign = 1;
st->clock_diff_count = conf.clock_diff_count_arg;
+ st->current_audio_format_num = -1;
sprintf(st->task.status, "status task");
}
return;
}
if (strcmp(conf.mode_arg, "on"))
- PARA_WARNING_LOG("%s", "invalid mode\n");
+ PARA_WARNING_LOG("invalid mode\n");
}
/**
};
if (audiod_cmdline_parser_config_file(config_file, &conf, ¶ms)) {
- PARA_EMERG_LOG("%s", "parse error in config file\n");
+ PARA_EMERG_LOG("parse error in config file\n");
exit(EXIT_FAILURE);
}
free(config_file);
log_welcome("para_audiod", conf.loglevel_arg);
i = init_stream_io();
if (i < 0) {
- PARA_EMERG_LOG("init stream io error: %s\n", PARA_STRERROR(-i));
+ PARA_EMERG_LOG("init stream io error: %s\n", para_strerror(-i));
exit(EXIT_FAILURE);
}
server_uptime(UPTIME_SET);
register_task(audiod_task);
s.default_timeout.tv_sec = 0;
s.default_timeout.tv_usec = 99 * 1000;
- ret = sched(&s);
+ ret = schedule(&s);
- PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+ PARA_EMERG_LOG("%s\n", para_strerror(-ret));
return EXIT_FAILURE;
}
projects / paraslash.git / blobdiff