Rename "dbtool" status item to "selector"

diff --git a/command.c b/command.c
index 6c895e3b9282ededaaa1a25ff988859c27605ca7..b07020a7cfd5d72aadfa9559e44ff323683251b9 100644 (file)
--- 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 f965a9d44e9f9db485c73c5a5dbde66fb2a424b3..029e043a867c32f13897baf9c19a1546f6b2ffd3 100644 (file)
--- 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 f3e67ed9c1213b13c3a486767564799421e089e4..d495139ea095ebdeea9abac7a773c053adc22f2e 100644 (file)
--- 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 84a4c0d2f8a0ef43a49ee92ce8130375c9f33437..81acd545ff4a5be97a5b0d9afba1e96816d86f5b 100644 (file)
--- 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 4ad1b5a88d957f411c5ccad6bb00f871e440f842..4259956f6ed5724d5afac014c170a1426b2e56db 100644 (file)
--- 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++)