alsa_write: Print more detailed error message.

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index 1fdbea7563803b3648d18eba95441e3ebb99b18e..dfb61db4c1d811fdedf97d5fa381defc241ae03b 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -33,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;
@@ -118,6 +118,9 @@ struct command_task {
 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;
@@ -516,7 +519,7 @@ static int check_stat_line(char *line, __a_unused void *data)
        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:
@@ -571,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.
  */
@@ -866,7 +869,7 @@ static int audiod_get_socket(void)
                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;
 }
 
@@ -948,7 +951,7 @@ static void close_stat_pipe(void)
                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;
        }
@@ -957,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(
-               "%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;
@@ -1165,7 +1168,7 @@ int main(int argc, char *argv[])
        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;