Add LYRICS_ID status item.
authorAndre Noll <maan@systemlinux.org>
Tue, 23 Oct 2007 21:05:05 +0000 (23:05 +0200)
committerAndre Noll <maan@systemlinux.org>
Tue, 23 Oct 2007 21:05:05 +0000 (23:05 +0200)
command.c
gui_theme.c
para.h
stat.c

index 71b3199..7962cc7 100644 (file)
--- 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);
index 831bf8e..8b6856b 100644 (file)
@@ -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 52fe369..9f2c59a 100644 (file)
--- 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 c447ace..eefac72 100644 (file)
--- 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)