return msg;
}
-/*
- * compute status bar string. Never returns NULL
- */
-static char *get_sb_string(struct misc_meta_data *nmmd)
-{
- char *base, *ret;
- long long unsigned secs = 0, rsecs = 0, percent = 0;
-
- base = para_basename(nmmd->filename);
- if (!base)
- return para_strdup("");
- if (!base[0])
- return base;
- if (nmmd->afi.chunks_total) {
- secs = (long long) nmmd->afi.seconds_total * nmmd->chunks_sent
- / nmmd->afi.chunks_total;
- rsecs = (long long) nmmd->afi.seconds_total *
- (nmmd->afi.chunks_total - nmmd->chunks_sent)
- / nmmd->afi.chunks_total;
- percent = 100 * ((nmmd->chunks_sent + 5) / 10)
- / ((nmmd->afi.chunks_total + 5) / 10);
- }
- ret = make_message("%llu:%02llu [%llu:%02llu] (%llu%%) %s",
- secs / 60, secs % 60,
- rsecs / 60, rsecs % 60,
- percent,
- base
- );
- free(base);
- return ret;
-}
-
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],
(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);
);
}
-/* sc */
-int com_sc(int fd, int argc, char * const * argv)
-{
- char *name = NULL;
- int ret, old = 0, count = -1; /* print af change forever */
-
- if (argc > 1)
- count = atoi(argv[1]);
-repeat:
- mmd_lock();
- if (old != mmd->num_played) {
- old = mmd->num_played;
- name = para_strdup(mmd->filename);
- }
- mmd_unlock();
- if (name) {
- ret = send_va_buffer(fd, "%s\n", name);
- free(name);
- name = NULL;
- if (ret < 0)
- return ret;
- if (argc > 1 && !--count)
- return 1;
- }
- usleep(500000);
- goto repeat;
-}
-
-/* sb */
-int com_sb(int fd, int argc, char * const * argv)
-{
- char *sb;
- int ret, nr = -1; /* status bar will be printed that many
- * times. Negative value means: print
- * forever
- */
- if (argc > 1)
- nr = atoi(argv[1]);
- while (nr) {
- mmd_lock();
- sb = get_sb_string(mmd);
- mmd_unlock();
- ret = send_va_buffer(fd, "%s\n", sb);
- free(sb);
- if (ret < 0)
- return ret;
- if (nr == 1)
- return 1;
- usleep(500000);
- if (nr > 0)
- nr--;
- }
- return 1;
-}
-
/* stat */
int com_stat(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++;
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;
projects / paraslash.git / blobdiff