Get rid of mmd->filename.

[paraslash.git] / command.c

diff --git a/command.c b/command.c
index 92fe18f07591f134270035c2845040efc3b070b8..2ccbe394b7119f70d4baad1c77d52b300c85e818 100644 (file)
--- a/command.c
+++ b/command.c
@@ -97,41 +97,41 @@ static char *vss_get_status_flags(unsigned int flags)
 
 static char *get_status(struct misc_meta_data *nmmd)
 {
-       char *bar, *ret, mtime[30] = "";
+       char *basename, *dirname, *ret, mtime[30] = "";
        char *status, *flags; /* vss status info */
        char *ut = uptime_str();
        long offset = (nmmd->offset + 500) / 1000;
        struct timeval now;
        struct tm mtime_tm;
 
-       if (nmmd->audio_format >= 0) {
-               localtime_r(&nmmd->mtime, &mtime_tm);
-               strftime(mtime, 29, "%a %b %d %Y", &mtime_tm);
-       }
+       localtime_r(&nmmd->mtime, &mtime_tm);
+       strftime(mtime, 29, "%a %b %d %Y", &mtime_tm);
        /* report real status */
        status = vss_status_tohuman(nmmd->vss_status_flags);
        flags = vss_get_status_flags(nmmd->vss_status_flags);
-       bar = para_basename(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:%lu.%lu\n"  "%s:%lu.%lu\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->afi.seconds_total,
+               status_item_list[SI_LENGTH], nmmd->afd.afhi.seconds_total,
                status_item_list[SI_NUM_PLAYED], nmmd->num_played,
 
-               status_item_list[SI_STATUS_BAR], bar ? bar : "(none)",
+               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->audio_format),
+               status_item_list[SI_FORMAT], audio_format_name(nmmd->afd.afsi.audio_format_id),
                status_item_list[SI_AFS_MODE], mmd->afs_mode_string,
-               nmmd->afi.info_string,
+               nmmd->afd.afhi.info_string,
 
                status_item_list[SI_UPTIME], ut,
                status_item_list[SI_STREAM_START],
@@ -139,10 +139,15 @@ static char *get_status(struct misc_meta_data *nmmd)
                        (long unsigned)nmmd->stream_start.tv_usec,
                status_item_list[SI_CURRENT_TIME],
                        (long unsigned)now.tv_sec,
-                       (long unsigned)now.tv_usec
+                       (long unsigned)now.tv_usec,
+               status_item_list[SI_ATTRIBUTES], mmd->afd.attributes_string,
+
+               status_item_list[SI_DIRECTORY], dirname,
+               status_item_list[SI_LYRICS_ID], nmmd->afd.afsi.lyrics_id
 
        );
-       free(bar);
+       free(basename);
+       free(dirname);
        free(flags);
        free(status);
        free(ut);
@@ -512,20 +517,20 @@ int com_ff(__a_unused int fd, int argc, char * const * argv)
                backwards = 1; /* jmp backwards */
        mmd_lock();
        ret = -E_NO_AUDIO_FILE;
-       if (!mmd->afi.chunks_total || !mmd->afi.seconds_total)
+       if (!mmd->afd.afhi.chunks_total || !mmd->afd.afhi.seconds_total)
                goto out;
-       promille = (1000 * mmd->current_chunk) / mmd->afi.chunks_total;
+       promille = (1000 * mmd->current_chunk) / mmd->afd.afhi.chunks_total;
        if (backwards)
-               promille -= 1000 * i / mmd->afi.seconds_total;
+               promille -= 1000 * i / mmd->afd.afhi.seconds_total;
        else
-               promille += 1000 * i / mmd->afi.seconds_total;
+               promille += 1000 * i / mmd->afd.afhi.seconds_total;
        if (promille < 0)
                promille = 0;
        if (promille >  1000) {
                mmd->new_vss_status_flags |= VSS_NEXT;
                goto out;
        }
-       mmd->repos_request = (mmd->afi.chunks_total * promille) / 1000;
+       mmd->repos_request = (mmd->afd.afhi.chunks_total * promille) / 1000;
        mmd->new_vss_status_flags |= VSS_REPOS;
        mmd->new_vss_status_flags &= ~VSS_NEXT;
        mmd->events++;
@@ -547,12 +552,12 @@ int com_jmp(__a_unused int fd, int argc, char * const * argv)
                return -E_COMMAND_SYNTAX;
        mmd_lock();
        ret = -E_NO_AUDIO_FILE;
-       if (!mmd->afi.chunks_total)
+       if (!mmd->afd.afhi.chunks_total)
                goto out;
        if (i > 100)
                i = 100;
        PARA_INFO_LOG("jumping to %lu%%\n", i);
-       mmd->repos_request = (mmd->afi.chunks_total * i + 50)/ 100;
+       mmd->repos_request = (mmd->afd.afhi.chunks_total * i + 50)/ 100;
        PARA_INFO_LOG("sent: %lu,  offset before jmp: %lu\n",
                mmd->chunks_sent, mmd->offset);
        mmd->new_vss_status_flags |= VSS_REPOS;