X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=d317c345314908b4629d7452e2f5fec4cb172f67;hp=9d473019c009f20f5c6f1e4b517712c8a254d49f;hb=54096edf9b0254303dfee9d8f87d2f2f0b17fcce;hpb=3e514007f72825597eaf68ff33339a8eb0ad420b

diff --git a/command.c b/command.c
index 9d473019..d317c345 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_SELECTOR], dblist[nmmd->dbt_num].name,
+		status_item_list[SI_SELECTOR], dblist[nmmd->selector_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,
@@ -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,8 +734,9 @@ 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 selector", dblist[mmd->dbt_num].name);
-	cmd = dblist[mmd->dbt_num].cmd_list;
+		*handler = make_message("the %s selector",
+			dblist[mmd->selector_num].name);
+	cmd = dblist[mmd->selector_num].cmd_list;
 	mmd_unlock();
 	for (; cmd->name; cmd++)
 		if (!strcmp(cmd->name, name))
@@ -756,8 +756,8 @@ static int com_help(int fd, int argc, char **argv)
 		if ((ret = send_description(fd, cmd_struct, "server", 0)) < 0)
 			return ret;
 		mmd_lock();
-		handler = para_strdup(dblist[mmd->dbt_num].name);
-		cmd = dblist[mmd->dbt_num].cmd_list;
+		handler = para_strdup(dblist[mmd->selector_num].name);
+		cmd = dblist[mmd->selector_num].cmd_list;
 		mmd_unlock();
 		ret = send_description(fd, cmd, handler, 0);
 		free(handler);
@@ -855,7 +855,7 @@ static int com_chs(int fd, int argc, char **argv)
 	if (!argc) {
 		char *selector;
 		mmd_lock();
-		selector = para_strdup(dblist[mmd->dbt_num].name);
+		selector = para_strdup(dblist[mmd->selector_num].name);
 		mmd_unlock();
 		ret = send_va_buffer(fd, "%s\n", selector);
 		free(selector);
@@ -865,7 +865,7 @@ static int com_chs(int fd, int argc, char **argv)
 		if (strcmp(dblist[i].name, argv[1]))
 			continue;
 		mmd_lock();
-		mmd->dbt_change = i;
+		mmd->selector_change = i;
 		mmd->events++;
 		mmd_unlock();
 		return 1;