X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=3bac70ade87f7ba644dd8f5af2a68c1740976bd2;hp=38aa5aafba75bcf7c67418ab7035f9eb0dbe11ff;hb=2bb11d7d5ee7f515287d5ac5ea09d80bc5d6780f;hpb=1f31b52b6816ce2716a3755a1896f77744fa167b diff --git a/audiod.c b/audiod.c index 38aa5aaf..3bac70ad 100644 --- a/audiod.c +++ b/audiod.c @@ -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: @@ -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; } @@ -958,7 +961,7 @@ static void close_stat_pipe(void) audiod_status_dump(); stat_task->playing = 0; stat_task->stat_item_values[SI_BASENAME] = make_message( - "%s:no connection to para_server\n", + "%s: no connection to para_server\n", status_item_list[SI_BASENAME]); stat_client_write(stat_task->stat_item_values[SI_BASENAME], SI_BASENAME);