2 files changed, 15 insertions, 0 deletions

diff --git a/apps/metadata/metadata_common.c b/apps/metadata/metadata_common.c
index d81d9f71d3..d1a1087188 100644
--- a/apps/metadata/metadata_common.c
+++ b/apps/metadata/metadata_common.c
@@ -224,6 +224,11 @@ long parse_tag(const char* name, char* value, struct mp3entry* id3,
         id3->tracknum = atoi(value);
         p = &(id3->track_string);
     }
+    else if (strcasecmp(name, "discnumber") == 0 || strcasecmp(name, "disc") == 0)
+    {
+        id3->discnum = atoi(value);
+        p = &(id3->disc_string);
+    }
     else if (((strcasecmp(name, "year") == 0) && (type == TAGTYPE_APE))
         || ((strcasecmp(name, "date") == 0) && (type == TAGTYPE_VORBIS)))
     {
diff --git a/apps/metadata/mp4.c b/apps/metadata/mp4.c
index 591d020373..3293007870 100644
--- a/apps/metadata/mp4.c
+++ b/apps/metadata/mp4.c
@@ -43,6 +43,7 @@
 #define MP4_cwrt MP4_ID(0xa9, 'w', 'r', 't')
 #define MP4_ccmt MP4_ID(0xa9, 'c', 'm', 't')
 #define MP4_cday MP4_ID(0xa9, 'd', 'a', 'y')
+#define MP4_disk MP4_ID('d', 'i', 's', 'k')
 #define MP4_esds MP4_ID('e', 's', 'd', 's')
 #define MP4_ftyp MP4_ID('f', 't', 'y', 'p')
 #define MP4_gnre MP4_ID('g', 'n', 'r', 'e')
@@ -422,6 +423,15 @@ static bool read_mp4_tags(int fd, struct mp3entry* id3,
                 &id3->genre_string);
             break;
 
+        case MP4_disk:
+            {
+                unsigned short n[2];
+                
+                read_mp4_tag(fd, size, (char*) &n, sizeof(n));
+                id3->disknum = betoh16(n[1]);
+            }
+            break;
+
         case MP4_trkn:
             {
                 unsigned short n[2];