Don't compute attributes string twice.

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index 5e0ff8d49f2dec598f1b87c64b1bf421dd9266a6..d2d0004a157f961b239cf4a89f66fcf8c86c72a2 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -5,6 +5,8 @@
  */
 
 /** \file audiod.c the paraslash's audio daemon */
+#include <sys/types.h>
+#include <dirent.h>
 
 #include "para.h"
 #include "error.h"
@@ -31,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;
@@ -116,6 +118,9 @@ struct command_task {
 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;
@@ -569,7 +574,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.
  */
@@ -955,11 +960,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;