Skip to content
This repository
Browse code

.mpc file tags (apev2) weren't read correctly. fixes #13985

  • Loading branch information...
commit 6fc42b277ed5a8c40b9b9241d07a1411630030f6 1 parent 485c491
authored January 23, 2013 S. Davilla committed January 23, 2013

Showing 1 changed file with 4 additions and 2 deletions. Show diff stats Hide diff stats

  1. 6  xbmc/music/tags/TagLoaderTagLib.cpp
6  xbmc/music/tags/TagLoaderTagLib.cpp
@@ -199,6 +199,8 @@ bool CTagLoaderTagLib::Load(const string& strFileName, CMusicInfoTag& tag, Embed
199 199
     id3v2 = ttaFile->ID3v2Tag(false);
200 200
   else if (wvFile)
201 201
     ape = wvFile->APETag(false);
  202
+  else if (mpcFile)
  203
+    ape = mpcFile->APETag(false);
202 204
   else    // This is a catch all to get generic information for other files types (s3m, xm, it, mod, etc)
203 205
     generic = file->tag();
204 206
 
@@ -456,11 +458,11 @@ bool CTagLoaderTagLib::ParseAPETag(APE::Tag *ape, EmbeddedArt *art, CMusicInfoTa
456 458
   for (APE::ItemListMap::ConstIterator it = itemListMap.begin(); it != itemListMap.end(); ++it)
457 459
   {
458 460
     if (it->first == "ARTIST")                         SetArtist(tag, StringListToVectorString(it->second.toStringList()));
459  
-    else if (it->first == "ALBUM ARTIST")              SetAlbumArtist(tag, StringListToVectorString(it->second.toStringList()));
  461
+    else if (it->first == "ALBUM ARTIST" || it->first == "ALBUMARTIST") SetAlbumArtist(tag, StringListToVectorString(it->second.toStringList()));
460 462
     else if (it->first == "ALBUM")                     tag.SetAlbum(it->second.toString().to8Bit(true));
461 463
     else if (it->first == "TITLE")                     tag.SetTitle(it->second.toString().to8Bit(true));
462 464
     else if (it->first == "TRACKNUMBER" || it->first == "TRACK") tag.SetTrackNumber(it->second.toString().toInt());
463  
-    else if (it->first == "DISCNUMBER")                tag.SetPartOfSet(it->second.toString().toInt());
  465
+    else if (it->first == "DISCNUMBER" || it->first == "DISC") tag.SetPartOfSet(it->second.toString().toInt());
464 466
     else if (it->first == "YEAR")                      tag.SetYear(it->second.toString().toInt());
465 467
     else if (it->first == "GENRE")                     SetGenre(tag, StringListToVectorString(it->second.toStringList()));
466 468
     else if (it->first == "COMMENT")                   tag.SetComment(it->second.toString().to8Bit(true));

0 notes on commit 6fc42b2

Please sign in to comment.
Something went wrong with that request. Please try again.