X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=2ccbe394b7119f70d4baad1c77d52b300c85e818;hp=f1a0bd186e262d2443f4e34c171335b49f928a64;hb=4a198ca75a3edf2865d599fc7aa0f672c4f30069;hpb=e63886e85c55c99e9732e5715b7ce641eff09914 diff --git a/command.c b/command.c index f1a0bd18..2ccbe394 100644 --- a/command.c +++ b/command.c @@ -109,15 +109,15 @@ static char *get_status(struct misc_meta_data *nmmd) /* report real status */ status = vss_status_tohuman(nmmd->vss_status_flags); flags = vss_get_status_flags(nmmd->vss_status_flags); - basename = para_basename(nmmd->filename); - dirname = para_dirname(nmmd->filename); + basename = para_basename(nmmd->afd.path); + dirname = para_dirname(nmmd->afd.path); gettimeofday(&now, NULL); 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:%s\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:%s\n" "%s:%u\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, @@ -126,7 +126,7 @@ static char *get_status(struct misc_meta_data *nmmd) status_item_list[SI_BASENAME], basename ? basename : "(none)", status_item_list[SI_STATUS], status, status_item_list[SI_STATUS_FLAGS], flags, - status_item_list[SI_SELECTOR], "FIXME", + status_item_list[SI_IMAGE_ID], nmmd->afd.afsi.image_id, status_item_list[SI_OFFSET], offset, status_item_list[SI_FORMAT], audio_format_name(nmmd->afd.afsi.audio_format_id), @@ -142,7 +142,8 @@ static char *get_status(struct misc_meta_data *nmmd) (long unsigned)now.tv_usec, status_item_list[SI_ATTRIBUTES], mmd->afd.attributes_string, - status_item_list[SI_DIRECTORY], dirname + status_item_list[SI_DIRECTORY], dirname, + status_item_list[SI_LYRICS_ID], nmmd->afd.afsi.lyrics_id ); free(basename);