*/
/** \file audiod.c the paraslash's audio daemon */
+#include <sys/types.h>
+#include <dirent.h>
#include "para.h"
-
+#include "error.h"
#include "audiod.cmdline.h"
#include "list.h"
#include "sched.h"
#include "fd.h"
#include "write.h"
#include "write_common.h"
-#include "error.h"
#include "signal.h"
/** define the array of error lists needed by para_audiod */
/** 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;
struct task task;
};
-/**
- * task for signal handling
- */
-struct signal_task {
- /** the signal pipe */
- int fd;
- /** the number of the most recent signal */
- int signum;
- /** the associated task structure */
- struct task task;
-};
-
/** iterate over all supported audio formats */
#define FOR_EACH_AUDIO_FORMAT(af) for (af = 0; af < NUM_AUDIO_FORMATS; af++)
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;
return count;
}
-static void check_stat_line(char *line)
+static int check_stat_line(char *line, __a_unused void *data)
{
int itemnum;
size_t ilen = 0;
// PARA_INFO_LOG("line: %s\n", line);
if (!line)
- return;
+ return 1;
itemnum = stat_line_valid(line);
if (itemnum < 0) {
PARA_WARNING_LOG("invalid status line: %s\n", line);
- return;
+ return 1;
}
if (stat_task->clock_diff_count && itemnum != SI_CURRENT_TIME)
- return;
+ return 1;
tmp = make_message("%s\n", line);
stat_client_write(tmp, itemnum);
free(tmp);
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:
stat_task->clock_diff_count--;
break;
}
+ return 1;
}
static void try_to_close_slot(int slot_num)
/*
* 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.
*/
PARA_EMERG_LOG("can not listen on socket\n");
exit(EXIT_FAILURE); /* do not unlink socket */
}
- mark_fd_nonblock(fd);
+ mark_fd_nonblocking(fd);
return fd;
}
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;
return;
}
bytes_left = for_each_line(st->pcd->buf, st->pcd->loaded,
- &check_stat_line);
+ &check_stat_line, NULL);
if (st->pcd->loaded != bytes_left) {
st->last_status_read = *now;
st->pcd->loaded = bytes_left;
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));
return EXIT_FAILURE;