Ticket #5820: musicbrainz_compilation.patch

mythmusic/metaiotaglib.cpp

@@ -31 +31 @@
         return false;
 
     File *taglib = new TagLib::MPEG::File(mdata->Filename().local8Bit());
-
     Tag *tag = taglib->tag();
 
     if (!tag)
@@ -48 +47 @@
     UserTextIdentificationFrame *musicbrainz = NULL;
     musicbrainz = find(taglib->ID3v2Tag(), "MusicBrainz Album Artist Id");
 
-    // Compilation Artist (TPE4)
+    // Compilation Artist (TPE2)
     TextIdentificationFrame *tpeframe = NULL;
-    TagLib::ID3v2::FrameList tpelist = taglib->ID3v2Tag()->frameListMap()["TPE4"];
+    TagLib::ID3v2::FrameList tpelist = taglib->ID3v2Tag()->frameListMap()["TPE2"];
     if (!tpelist.isEmpty())
         tpeframe = (TextIdentificationFrame *)tpelist.front();
 
@@ -69 +68 @@
         if (!mdata->CompilationArtist().isEmpty())
         {
             if (!tpeframe) {
-                tpeframe = new TextIdentificationFrame(TagLib::ByteVector("TPE4"), TagLib::String::UTF8);
+                tpeframe = new TextIdentificationFrame(TagLib::ByteVector("TPE2"), TagLib::String::UTF8);
                 taglib->ID3v2Tag()->addFrame(tpeframe);
             }
 
@@ -155 +154 @@
     // ID3V2 Only Tags
     if (taglib->ID3v2Tag())
     {
-        // Compilation Artist (TPE4)
-        if(!taglib->ID3v2Tag()->frameListMap()["TPE4"].isEmpty())
+        // Compilation Artist (TPE2)
+        if(!taglib->ID3v2Tag()->frameListMap()["TPE2"].isEmpty())
         {
             compilation_artist = TStringToQString(
-            taglib->ID3v2Tag()->frameListMap()["TPE4"].front()->toString())
+            taglib->ID3v2Tag()->frameListMap()["TPE2"].front()->toString())
             .stripWhiteSpace();
         }
 
         // Look for MusicBrainz Album+Artist ID in TXXX Frame
         UserTextIdentificationFrame *musicbrainz = find(taglib->ID3v2Tag(),
                 "MusicBrainz Album Artist Id");
-
+        UserTextIdentificationFrame *musicbrainzalbumtype = find(taglib->ID3v2Tag(),
+                "MusicBrainz Album Type");
+        
         if (musicbrainz)
         {
             // If the MusicBrainz ID is the special "Various Artists" ID
@@ -176 +177 @@
                 == TStringToQString(musicbrainz->fieldList().front()));
         }
 
+        if (!compilation && musicbrainzalbumtype)
+        {
+            // If the MusicBrainz Album Type is 'compilation', then compilation is TRUE
+            QString albumtype;
+            if (! musicbrainzalbumtype->fieldList().isEmpty())
+                albumtype = TStringToQString(musicbrainzalbumtype->fieldList().front());
+                compilation = (albumtype.contains(QString("compilation")) || albumtype.contains(QString("soundtrack")));
+        }
+
         // Length
         if(!taglib->ID3v2Tag()->frameListMap()["TLEN"].isEmpty())
             length = taglib->ID3v2Tag()->frameListMap()["TLEN"].front()->toString().toInt();

mythmusic/metaiooggvorbiscomment.cpp

@@ -13 +13 @@
 // MythTV headers
 #include <mythtv/compat.h>
 #include <mythtv/util.h>
+#include <mythtv/mythcontext.h>
 
 // MythMusic headers
 #include "metaiooggvorbiscomment.h"
@@ -306 +307 @@
             genre = getComment(comment, MYTH_VORBISCOMMENT_GENRE);
             tracknum = atoi(getComment(comment, MYTH_VORBISCOMMENT_TRACK).ascii()); 
             year = atoi(getComment(comment, MYTH_VORBISCOMMENT_DATE).ascii());
+
+            QString album_artist_id = getComment(comment, MYTH_VORBISCOMMENT_MUSICBRAINZ_ALBUMARTISTID);
+            QString album_type = getComment(comment, MYTH_VORBISCOMMENT_MUSICBRAINZ_ALBUMTYPE);
+            compilation = (MYTH_MUSICBRAINZ_ALBUMARTIST_UUID == album_artist_id || 
+                album_type.contains(QString("compilation")) || album_type.contains(QString("soundtrack")));
+
+
             
-            QString tmp = getComment(comment, MYTH_VORBISCOMMENT_MUSICBRAINZ_ALBUMARTISTID);
-            compilation = (MYTH_MUSICBRAINZ_ALBUMARTIST_UUID == tmp);
-
             length = getTrackLength(&vf);
 
             // Do not call fclose as ov_clear takes care of things for us.

mythmusic/metaiovorbiscomment.h

@@ -9 +9 @@
 #define MYTH_VORBISCOMMENT_GENRE                     "GENRE"
 #define MYTH_VORBISCOMMENT_DATE                      "DATE"
 #define MYTH_VORBISCOMMENT_TRACK                     "TRACKNUMBER"
-#define MYTH_VORBISCOMMENT_COMPILATIONARTIST         "COMPILATION_ARTIST"
+#define MYTH_VORBISCOMMENT_COMPILATIONARTIST         "ALBUMARTIST"
 #define MYTH_VORBISCOMMENT_MUSICBRAINZ_ALBUMARTISTID "MUSICBRAINZ_ALBUMARTISTID"
+#define MYTH_VORBISCOMMENT_MUSICBRAINZ_ALBUMTYPE     "RELEASETYPE"
 
 #endif