From dfaa2c1b2505dc2e192bd6e8baa80a5d02ed78b7 Mon Sep 17 00:00:00 2001
From: Andre <maan@p133.(none)>
Date: Fri, 10 Mar 2006 20:41:25 +0100
Subject: [PATCH] Rename "dbtool" status item to "selector"

---
 command.c   |  2 +-
 gui_theme.c | 16 ++++++++--------
 para.h      |  4 ++--
 sdl_gui.c   | 24 ++++++++++++------------
 stat.c      |  2 +-
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/command.c b/command.c
index 6c895e3b..b07020a7 100644
--- a/command.c
+++ b/command.c
@@ -426,7 +426,7 @@ 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),
diff --git a/gui_theme.c b/gui_theme.c
index f965a9d4..029e043a 100644
--- a/gui_theme.c
+++ b/gui_theme.c
@@ -148,14 +148,14 @@ static void init_theme_colorful_blackness(struct gui_theme *t)
 	d[SI_STATUS_FLAGS].y = 17;
 	d[SI_STATUS_FLAGS].len = 10;
 
-	d[SI_DBTOOL].prefix = "selector: ";
-	d[SI_DBTOOL].postfix = "";
-	d[SI_DBTOOL].fg = COLOR_RED;
-	d[SI_DBTOOL].bg = COLOR_BLACK;
-	d[SI_DBTOOL].align = CENTER;
-	d[SI_DBTOOL].x = 21;
-	d[SI_DBTOOL].y = 17;
-	d[SI_DBTOOL].len = 20;
+	d[SI_SELECTOR].prefix = "selector: ";
+	d[SI_SELECTOR].postfix = "";
+	d[SI_SELECTOR].fg = COLOR_RED;
+	d[SI_SELECTOR].bg = COLOR_BLACK;
+	d[SI_SELECTOR].align = CENTER;
+	d[SI_SELECTOR].x = 21;
+	d[SI_SELECTOR].y = 17;
+	d[SI_SELECTOR].len = 20;
 
 	d[SI_FORMAT].prefix = "format: ";
 	d[SI_FORMAT].postfix = "";
diff --git a/para.h b/para.h
index f3e67ed9..d495139e 100644
--- a/para.h
+++ b/para.h
@@ -156,9 +156,9 @@ enum {
 	SI_DBINFO3,		SI_DECODER_FLAGS,	SI_AUDIOD_STATUS,
 	SI_PLAY_TIME,		SI_UPTIME,		SI_OFFSET,
 	SI_LENGTH,		SI_STREAM_START,	SI_CURRENT_TIME,
-	SI_AUDIOD_UPTIME,	SI_DBTOOL,
+	SI_AUDIOD_UPTIME,	SI_SELECTOR,		NUM_STAT_ITEMS
 };
-#define NUM_STAT_ITEMS (SI_DBTOOL + 1)
+
 int stat_line_valid(const char *);
 void stat_client_write(char *msg);
 int stat_client_add(int);
diff --git a/sdl_gui.c b/sdl_gui.c
index 84a4c0d2..81acd545 100644
--- a/sdl_gui.c
+++ b/sdl_gui.c
@@ -211,18 +211,18 @@ static void init_stat_items(void)
 	s[SI_UPTIME].font = N_YELLOW;
 	s[SI_UPTIME].align = RIGHT;
 
-	s[SI_DBTOOL].prefix = "selector: ";
-	s[SI_DBTOOL].postfix = "";
-	s[SI_DBTOOL].content = "no content yet";
-	s[SI_DBTOOL].x = 35;
-	s[SI_DBTOOL].y = 48;
-	s[SI_DBTOOL].w = 35;
-	s[SI_DBTOOL].h = FONT_HEIGHT;
-	s[SI_DBTOOL].r = 0;
-	s[SI_DBTOOL].g = 0;
-	s[SI_DBTOOL].b = 0;
-	s[SI_DBTOOL].font = N_YELLOW;
-	s[SI_DBTOOL].align = LEFT;
+	s[SI_SELECTOR].prefix = "selector: ";
+	s[SI_SELECTOR].postfix = "";
+	s[SI_SELECTOR].content = "no content yet";
+	s[SI_SELECTOR].x = 35;
+	s[SI_SELECTOR].y = 48;
+	s[SI_SELECTOR].w = 35;
+	s[SI_SELECTOR].h = FONT_HEIGHT;
+	s[SI_SELECTOR].r = 0;
+	s[SI_SELECTOR].g = 0;
+	s[SI_SELECTOR].b = 0;
+	s[SI_SELECTOR].font = N_YELLOW;
+	s[SI_SELECTOR].align = LEFT;
 
 	s[SI_FORMAT].prefix = "Format: ";
 	s[SI_FORMAT].postfix = "";
diff --git a/stat.c b/stat.c
index 4ad1b5a8..4259956f 100644
--- a/stat.c
+++ b/stat.c
@@ -91,7 +91,7 @@ const char *status_item_list[NUM_STAT_ITEMS] = {
 	[SI_CURRENT_TIME] = "current_time",
 
 	[SI_AUDIOD_UPTIME] = "audiod_uptime",
-	[SI_DBTOOL] = "dbtool"
+	[SI_SELECTOR] = "dbtool"
 };
 #define FOR_EACH_STAT_ITEM(i) for (i = 0; i < NUM_STAT_ITEMS; i++)
 
-- 
2.30.2