X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=command.c;h=b2dca3a36b4665e8423042b2eea26b759cb96c92;hb=cbec60cc7923bdcb4bb00c183c6f3a632889ed1d;hp=3a58300e22fec2d0d64a403f0ca814cb0f37a9d8;hpb=a7b64b9b52dae1ab49f850376d1d1ce3b2a15946;p=paraslash.git diff --git a/command.c b/command.c index 3a58300e..b2dca3a3 100644 --- a/command.c +++ b/command.c @@ -117,9 +117,9 @@ static char *get_status(struct misc_meta_data *nmmd) ret = make_message( "%s:%zu\n" "%s:%s\n" "%s:%lu\n" "%s:%u\n" "%s:%s\n" "%s:%s\n" "%s:%s\n" "%s:%u\n" - "%s:%li\n" "%s:%s\n" "%s:%s\n" "%s" - "%s:%s\n" "%s:%lu.%lu\n" "%s:%lu.%lu\n" "%s:%s\n" - "%s:%s\n" "%s:%u\n", + "%s:%li\n" "%s:%s\n" "%s" + "%s:%s\n" "%s:%lu.%lu\n" "%s:%lu.%lu\n" + "%s:%s\n" "%s:%u\n" "%s\n", status_item_list[SI_FILE_SIZE], nmmd->size / 1024, status_item_list[SI_MTIME], mtime, status_item_list[SI_LENGTH], nmmd->afd.afhi.seconds_total, @@ -131,9 +131,6 @@ static char *get_status(struct misc_meta_data *nmmd) status_item_list[SI_IMAGE_ID], nmmd->afd.afsi.image_id, status_item_list[SI_OFFSET], offset, - status_item_list[SI_FORMAT], basename? - audio_format_name(nmmd->afd.afsi.audio_format_id) - : "", status_item_list[SI_AFS_MODE], mmd->afs_mode_string, nmmd->afd.afhi.info_string, @@ -144,10 +141,10 @@ static char *get_status(struct misc_meta_data *nmmd) status_item_list[SI_CURRENT_TIME], (long unsigned)now.tv_sec, (long unsigned)now.tv_usec, - status_item_list[SI_ATTRIBUTES], mmd->afd.attributes_string, status_item_list[SI_DIRECTORY], dirname? dirname : "(none)", - status_item_list[SI_LYRICS_ID], nmmd->afd.afsi.lyrics_id + status_item_list[SI_LYRICS_ID], nmmd->afd.afsi.lyrics_id, + nmmd->afd.afs_status_info ); free(basename);