X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=audiod.c;h=3bac70ade87f7ba644dd8f5af2a68c1740976bd2;hb=81e53d96523f470ac2139dc1ee4c954265b37ec7;hp=d2d0004a157f961b239cf4a89f66fcf8c86c72a2;hpb=8769ef42c84de55cea4cd6820802e8b8f53393c8;p=paraslash.git diff --git a/audiod.c b/audiod.c index d2d0004a..3bac70ad 100644 --- a/audiod.c +++ b/audiod.c @@ -119,7 +119,7 @@ int get_audio_format_num(char *name) { int i; - while (isspace(*name)) + while (para_isspace(*name)) name++; FOR_EACH_AUDIO_FORMAT(i) if (!strcmp(name, audio_formats[i])) @@ -519,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: @@ -951,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; } @@ -961,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);