Ticket #3697: mythmusic-comp.patch

mythmusic/mythmusic/metaiotaglib.cpp

@@ -122 +122 @@
 Metadata* MetaIOTagLib::read(QString filename)
 {
     QString artist = "", compilation_artist = "", album = "", title = "",
-            genre = "";
+            genre = "", musicbrainz_id = "";
     int year = 0, tracknum = 0, length = 0, playcount = 0, rating = 0, id = 0;
     bool compilation = false;
     QValueList<struct AlbumArtImage> albumart;
@@ -156 +156 @@
     {
         // Compilation Artist (TPE4)
         if(!taglib->ID3v2Tag()->frameListMap()["TPE4"].isEmpty())
+        {
             compilation_artist = TStringToQString(
             taglib->ID3v2Tag()->frameListMap()["TPE4"].front()->toString()
-                .stripWhiteSpace());
+                .stripWhiteSpace());                
+        }
 
         // Look for MusicBrainz Album+Artist ID in TXXX Frame
         UserTextIdentificationFrame *musicbrainz = find(taglib->ID3v2Tag(),
@@ -166 +168 @@
 
         if (musicbrainz)
         {
+            musicbrainz_id = TStringToQString(musicbrainz->toString());
+            
             // If the MusicBrainz ID is the special "Various Artists" ID
             // then compilation is TRUE
-            compilation = (MYTH_MUSICBRAINZ_ALBUMARTIST_UUID
-                == TStringToQString(musicbrainz->toString()));
+            compilation = musicbrainz_id.contains(MYTH_MUSICBRAINZ_ALBUMARTIST_UUID, FALSE);
         }
 
         // Length