From: Andre Noll <maan@systemlinux.org>
Date: Tue, 23 Oct 2007 21:05:05 +0000 (+0200)
Subject: Add LYRICS_ID status item.
X-Git-Tag: v0.3.0~228
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=82f73e338ee087647f2c38250f1af1e225cd1f51;ds=sidebyside

Add LYRICS_ID status item.
---

diff --git a/command.c b/command.c
index 71b31998..7962cc79 100644
--- a/command.c
+++ b/command.c
@@ -117,7 +117,7 @@ static char *get_status(struct misc_meta_data *nmmd)
 		"%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",
+		"%s:%s\n"	"%s:%u\n",
 		status_item_list[SI_FILE_SIZE], nmmd->size / 1024,
 		status_item_list[SI_MTIME], mtime,
 		status_item_list[SI_LENGTH], nmmd->afd.afhi.seconds_total,
@@ -142,7 +142,8 @@ static char *get_status(struct misc_meta_data *nmmd)
 			(long unsigned)now.tv_usec,
 		status_item_list[SI_ATTRIBUTES], mmd->afd.attributes_string,
 
-		status_item_list[SI_DIRECTORY], dirname
+		status_item_list[SI_DIRECTORY], dirname,
+		status_item_list[SI_LYRICS_ID], nmmd->afd.afsi.lyrics_id
 
 	);
 	free(basename);
diff --git a/gui_theme.c b/gui_theme.c
index 831bf8ef..8b6856bf 100644
--- a/gui_theme.c
+++ b/gui_theme.c
@@ -144,7 +144,16 @@ static void init_theme_colorful_blackness(struct gui_theme *t)
 	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_IMAGE_ID].len = 10;
+
+	d[SI_LYRICS_ID].prefix = "lyr: ";
+	d[SI_LYRICS_ID].postfix = "";
+	d[SI_LYRICS_ID].fg = COLOR_RED;
+	d[SI_LYRICS_ID].bg = COLOR_BLACK;
+	d[SI_LYRICS_ID].align = CENTER;
+	d[SI_LYRICS_ID].x = 31;
+	d[SI_LYRICS_ID].y = 17;
+	d[SI_LYRICS_ID].len = 11;
 
 	d[SI_FORMAT].prefix = "format: ";
 	d[SI_FORMAT].postfix = "";
diff --git a/para.h b/para.h
index 52fe3699..9f2c59a8 100644
--- a/para.h
+++ b/para.h
@@ -168,7 +168,8 @@ 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_IMAGE_ID,		NUM_STAT_ITEMS
+	SI_AUDIOD_UPTIME,	SI_IMAGE_ID,		SI_LYRICS_ID,
+	NUM_STAT_ITEMS
 };
 
 int stat_item_valid(const char *item);
diff --git a/stat.c b/stat.c
index c447aceb..eefac72c 100644
--- a/stat.c
+++ b/stat.c
@@ -79,7 +79,8 @@ const char *status_item_list[NUM_STAT_ITEMS] = {
 	[SI_CURRENT_TIME] = "current_time",
 
 	[SI_AUDIOD_UPTIME] = "audiod_uptime",
-	[SI_IMAGE_ID] = "image_id"
+	[SI_IMAGE_ID] = "image_id",
+	[SI_LYRICS_ID] = "lyrics_id"
 };
 
 static void dump_stat_client_list(void)