4 files changed, 16 insertions, 0 deletions

diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index 2c5238b972..9dddff3ea2 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -876,6 +876,15 @@ static char *get_token_value(struct gui_wps *gwps,
         case WPS_TOKEN_METADATA_GENRE:
             return id3->genre_string;
 
+        case WPS_TOKEN_METADATA_DISC_NUMBER:
+            if (id3->disc_string)
+                return id3->disc_string;
+            if (id3->discnum) {
+                snprintf(buf, buf_size, "%d", id3->discnum);
+                return buf;
+            }
+            return NULL;
+
         case WPS_TOKEN_METADATA_TRACK_NUMBER:
             if (id3->track_string)
                 return id3->track_string;
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h
index 371b2b0399..b02b87f2c9 100644
--- a/apps/gui/gwps.h
+++ b/apps/gui/gwps.h
@@ -193,6 +193,7 @@ enum wps_token_type {
     WPS_TOKEN_METADATA_ALBUM_ARTIST,
     WPS_TOKEN_METADATA_ALBUM,
     WPS_TOKEN_METADATA_GENRE,
+    WPS_TOKEN_METADATA_DISC_NUMBER,
     WPS_TOKEN_METADATA_TRACK_NUMBER,
     WPS_TOKEN_METADATA_TRACK_TITLE,
     WPS_TOKEN_METADATA_VERSION,
diff --git a/apps/gui/wps_debug.c b/apps/gui/wps_debug.c
index 0f40a57801..50ffcce119 100644
--- a/apps/gui/wps_debug.c
+++ b/apps/gui/wps_debug.c
@@ -294,6 +294,10 @@ static void dump_wps_tokens(struct wps_data *data)
                          next_str(next));
                 break;
 
+            case WPS_TOKEN_METADATA_DISC_NUMBER:
+                snprintf(buf, sizeof(buf), "%strack disc", next_str(next));
+                break;
+
             case WPS_TOKEN_METADATA_TRACK_NUMBER:
                 snprintf(buf, sizeof(buf), "%strack number",
                          next_str(next));
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c
index 86b74129f2..d66e47dfe7 100644
--- a/apps/gui/wps_parser.c
+++ b/apps/gui/wps_parser.c
@@ -201,6 +201,7 @@ static const struct wps_tag all_tags[] = {
     { WPS_TOKEN_METADATA_ALBUM,           "id",  WPS_REFRESH_STATIC,  NULL },
     { WPS_TOKEN_METADATA_ALBUM_ARTIST,    "iA",  WPS_REFRESH_STATIC,  NULL },
     { WPS_TOKEN_METADATA_GENRE,           "ig",  WPS_REFRESH_STATIC,  NULL },
+    { WPS_TOKEN_METADATA_DISC_NUMBER,     "ik",  WPS_REFRESH_STATIC,  NULL },
     { WPS_TOKEN_METADATA_TRACK_NUMBER,    "in",  WPS_REFRESH_STATIC,  NULL },
     { WPS_TOKEN_METADATA_TRACK_TITLE,     "it",  WPS_REFRESH_STATIC,  NULL },
     { WPS_TOKEN_METADATA_VERSION,         "iv",  WPS_REFRESH_STATIC,  NULL },
@@ -213,6 +214,7 @@ static const struct wps_tag all_tags[] = {
     { WPS_TOKEN_METADATA_ALBUM,           "Id",  WPS_REFRESH_DYNAMIC, NULL },
     { WPS_TOKEN_METADATA_ALBUM_ARTIST,    "IA",  WPS_REFRESH_DYNAMIC, NULL },
     { WPS_TOKEN_METADATA_GENRE,           "Ig",  WPS_REFRESH_DYNAMIC, NULL },
+    { WPS_TOKEN_METADATA_DISC_NUMBER,     "Ik",  WPS_REFRESH_DYNAMIC, NULL },
     { WPS_TOKEN_METADATA_TRACK_NUMBER,    "In",  WPS_REFRESH_DYNAMIC, NULL },
     { WPS_TOKEN_METADATA_TRACK_TITLE,     "It",  WPS_REFRESH_DYNAMIC, NULL },
     { WPS_TOKEN_METADATA_VERSION,         "Iv",  WPS_REFRESH_DYNAMIC, NULL },