}
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:%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:%zu\n" "%s:%s\n" "%s:%lu\n"
+ "%s:%s\n" "%s:%s\n" "%s:%s\n"
+ "%s:%li\n" "%s:%s\n"
+ "%s:%s\n" "%s:%lu.%lu\n" "%s:%lu.%lu\n"
+ "%s:%s\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,
- status_item_list[SI_NUM_PLAYED], nmmd->num_played,
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_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,
status_item_list[SI_UPTIME], ut,
status_item_list[SI_STREAM_START],
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
+ nmmd->afd.afs_status_info
);
free(basename);
for (cmd = server_cmds; cmd->name; cmd++)
if (!strcmp(cmd->name, name)) {
if (handler)
- *handler = para_strdup("para_server"); /* server commands */
+ *handler = para_strdup("server"); /* server commands */
return cmd;
}
/* not found, look for commands supported by afs */
for (cmd = afs_cmds; cmd->name; cmd++)
- if (!strcmp(cmd->name, name))
+ if (!strcmp(cmd->name, name)) {
+ if (handler)
+ *handler = para_strdup("afs");
return cmd;
+ }
return NULL;
}