X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=command.c;h=ee165e88b923efda643fc54845790394741557ed;hb=9f10e6742ffc2ac5e4bf6224e1ff882074c7ca45;hp=6c895e3b9282ededaaa1a25ff988859c27605ca7;hpb=7ee0e41ae6c4618a62e25a4f086e27697f3545c6;p=paraslash.git

diff --git a/command.c b/command.c
index 6c895e3b..ee165e88 100644
--- a/command.c
+++ b/command.c
@@ -426,11 +426,11 @@ static char *get_status(struct misc_meta_data *nmmd)
 		status_item_list[SI_STATUS_BAR], bar ? bar : "(none)",
 		status_item_list[SI_STATUS], status,
 		status_item_list[SI_STATUS_FLAGS], flags,
-		status_item_list[SI_DBTOOL], dblist[nmmd->dbt_num].name,
+		status_item_list[SI_SELECTOR], dblist[nmmd->dbt_num].name,
 
 		status_item_list[SI_OFFSET], offset,
 		status_item_list[SI_FORMAT], audio_format_name(nmmd->audio_format),
-		nmmd->dbinfo,
+		nmmd->selector_info,
 		nmmd->audio_file_info,
 
 		status_item_list[SI_UPTIME], ut,
@@ -582,7 +582,7 @@ static int com_si(int fd, int argc, __unused char **argv)
 		"mallinfo: %d\n"
 		"connections (active/accepted/total): %u/%u/%u\n"
 		"current loglevel: %i\n"
-		"supported database tools: %s\n"
+		"supported audio file selectors: %s\n"
 		"supported audio formats: %s\n"
 		"supported senders: %s\n"
 		"%s",
@@ -676,7 +676,6 @@ static int com_sb(int socket_fd, int argc, char **argv)
 /* stat */
 static int com_stat(int socket_fd, int argc, char **argv)
 {
-//	char *old_stat = NULL, *old_dbinfo = NULL;
 	int ret, num = 0;/* status will be printed that many
 			  * times. num <= 0 means: print forever
 			  */
@@ -735,7 +734,7 @@ static struct server_command *get_cmd_ptr(char *name, char **handler)
 	/* not found, look for commands supported by the current selector */
 	mmd_lock();
 	if (handler)
-		*handler = make_message("the %s database tool", dblist[mmd->dbt_num].name);
+		*handler = make_message("the %s selector", dblist[mmd->dbt_num].name);
 	cmd = dblist[mmd->dbt_num].cmd_list;
 	mmd_unlock();
 	for (; cmd->name; cmd++)
@@ -870,7 +869,7 @@ static int com_chs(int fd, int argc, char **argv)
 		mmd_unlock();
 		return 1;
 	}
-	return -E_BAD_DBTOOL;
+	return -E_BAD_SELECTOR;
 }
 
 /* next */