4 files changed, 11 insertions, 0 deletions

diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index 82bf7541f2..3c74509ec8 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -866,6 +866,9 @@ static char *get_token_value(struct gui_wps *gwps,
         case WPS_TOKEN_METADATA_ALBUM_ARTIST:
             return id3->albumartist;
 
+        case WPS_TOKEN_METADATA_GROUPING:
+            return id3->grouping;
+            
         case WPS_TOKEN_METADATA_GENRE:
             return id3->genre_string;
 
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h
index b02b87f2c9..83ff14b80b 100644
--- a/apps/gui/gwps.h
+++ b/apps/gui/gwps.h
@@ -191,6 +191,7 @@ enum wps_token_type {
     WPS_TOKEN_METADATA_ARTIST,
     WPS_TOKEN_METADATA_COMPOSER,
     WPS_TOKEN_METADATA_ALBUM_ARTIST,
+    WPS_TOKEN_METADATA_GROUPING,
     WPS_TOKEN_METADATA_ALBUM,
     WPS_TOKEN_METADATA_GENRE,
     WPS_TOKEN_METADATA_DISC_NUMBER,
diff --git a/apps/gui/wps_debug.c b/apps/gui/wps_debug.c
index 50ffcce119..58e6ab49aa 100644
--- a/apps/gui/wps_debug.c
+++ b/apps/gui/wps_debug.c
@@ -289,6 +289,11 @@ static void dump_wps_tokens(struct wps_data *data)
                          next_str(next));
                 break;
 
+            case WPS_TOKEN_METADATA_GROUPING:
+                snprintf(buf, sizeof(buf), "%strack grouping",
+                         next_str(next));
+                break;
+
             case WPS_TOKEN_METADATA_GENRE:
                 snprintf(buf, sizeof(buf), "%strack genre",
                          next_str(next));
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c
index d66e47dfe7..8471bff7d8 100644
--- a/apps/gui/wps_parser.c
+++ b/apps/gui/wps_parser.c
@@ -200,6 +200,7 @@ static const struct wps_tag all_tags[] = {
     { WPS_TOKEN_METADATA_COMPOSER,        "ic",  WPS_REFRESH_STATIC,  NULL },
     { WPS_TOKEN_METADATA_ALBUM,           "id",  WPS_REFRESH_STATIC,  NULL },
     { WPS_TOKEN_METADATA_ALBUM_ARTIST,    "iA",  WPS_REFRESH_STATIC,  NULL },
+    { WPS_TOKEN_METADATA_GROUPING,        "iG",  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 },
@@ -213,6 +214,7 @@ static const struct wps_tag all_tags[] = {
     { WPS_TOKEN_METADATA_COMPOSER,        "Ic",  WPS_REFRESH_DYNAMIC, NULL },
     { WPS_TOKEN_METADATA_ALBUM,           "Id",  WPS_REFRESH_DYNAMIC, NULL },
     { WPS_TOKEN_METADATA_ALBUM_ARTIST,    "IA",  WPS_REFRESH_DYNAMIC, NULL },
+    { WPS_TOKEN_METADATA_GROUPING,        "IG",  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 },