X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=7302d3e48039609660538daad17b3a6590190517;hp=e294e87c9cbbe6e9ce1e2358ceb9b10e30035a09;hb=ab0e988bdbccd590a3e7ad101ae152ead4d2bfdb;hpb=8897da301fdbbc7e9b7cff90c2c33dfa9240f66f

diff --git a/command.c b/command.c
index e294e87c..7302d3e4 100644
--- a/command.c
+++ b/command.c
@@ -115,27 +115,20 @@ static char *get_status(struct misc_meta_data *nmmd)
 	}
 	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:%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],
@@ -144,10 +137,9 @@ 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
+		nmmd->afd.afs_status_info
 
 	);
 	free(basename);
@@ -376,13 +368,16 @@ static struct server_command *get_cmd_ptr(const char *name, char **handler)
 	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;
 }