Add missing newline in ls output.

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index d4abb3b2ba3a2e01d3da64dd7834aecae40dd2e1..38aa5aafba75bcf7c67418ab7035f9eb0dbe11ff 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -5,9 +5,11 @@
  */
 
 /** \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"
@@ -24,7 +26,6 @@
 #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 */
@@ -32,7 +33,7 @@ INIT_AUDIOD_ERRLISTS;
 /** 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;
@@ -104,18 +105,6 @@ struct command_task {
        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++)
 
@@ -582,7 +571,7 @@ 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.
  */
@@ -968,11 +957,11 @@ static void close_stat_pipe(void)
        stat_task->offset_seconds = 0;
        audiod_status_dump();
        stat_task->playing = 0;
-       stat_task->stat_item_values[SI_STATUS_BAR] = make_message(
+       stat_task->stat_item_values[SI_BASENAME] = 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);
+               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;