From: Andre Noll <maan@systemlinux.org>
Date: Tue, 23 Oct 2007 20:50:37 +0000 (+0200)
Subject: Replace status item SELECTOR by IMAGE_ID.
X-Git-Tag: v0.3.0~229
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=459acdd4599a59effdd7fadd4a586e3b13e67b67

Replace status item SELECTOR by IMAGE_ID.
---

diff --git a/command.c b/command.c
index f1a0bd18..71b31998 100644
--- a/command.c
+++ b/command.c
@@ -114,7 +114,7 @@ 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:%s\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",
@@ -126,7 +126,7 @@ static char *get_status(struct misc_meta_data *nmmd)
 		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_SELECTOR], "FIXME",
+		status_item_list[SI_IMAGE_ID], nmmd->afd.afsi.image_id,
 
 		status_item_list[SI_OFFSET], offset,
 		status_item_list[SI_FORMAT], audio_format_name(nmmd->afd.afsi.audio_format_id),
diff --git a/gui_theme.c b/gui_theme.c
index e7112b3f..831bf8ef 100644
--- a/gui_theme.c
+++ b/gui_theme.c
@@ -137,14 +137,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_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 = 21;
+	d[SI_IMAGE_ID].prefix = "img: ";
+	d[SI_IMAGE_ID].postfix = "";
+	d[SI_IMAGE_ID].fg = COLOR_RED;
+	d[SI_IMAGE_ID].bg = COLOR_BLACK;
+	d[SI_IMAGE_ID].align = CENTER;
+	d[SI_IMAGE_ID].x = 21;
+	d[SI_IMAGE_ID].y = 17;
+	d[SI_IMAGE_ID].len = 21;
 
 	d[SI_FORMAT].prefix = "format: ";
 	d[SI_FORMAT].postfix = "";
diff --git a/para.h b/para.h
index 258f8b8d..52fe3699 100644
--- a/para.h
+++ b/para.h
@@ -168,7 +168,7 @@ enum {
 	SI_DIRECTORY,		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_SELECTOR,		NUM_STAT_ITEMS
+	SI_AUDIOD_UPTIME,	SI_IMAGE_ID,		NUM_STAT_ITEMS
 };
 
 int stat_item_valid(const char *item);
diff --git a/stat.c b/stat.c
index 3ba13b7e..c447aceb 100644
--- a/stat.c
+++ b/stat.c
@@ -79,7 +79,7 @@ const char *status_item_list[NUM_STAT_ITEMS] = {
 	[SI_CURRENT_TIME] = "current_time",
 
 	[SI_AUDIOD_UPTIME] = "audiod_uptime",
-	[SI_SELECTOR] = "dbtool"
+	[SI_IMAGE_ID] = "image_id"
 };
 
 static void dump_stat_client_list(void)