*/
/** \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;
int get_audio_format_num(char *name)
{
int i;
+
+ while (isspace(*name))
+ name++;
FOR_EACH_AUDIO_FORMAT(i)
if (!strcmp(name, audio_formats[i]))
return i;
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:
/*
* 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.
*/
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;