diff options
| author | Jonathan Marshall <jmarshall@never.you.mind> | 2013-01-23 21:34:43 +1300 |
|---|---|---|
| committer | Jonathan Marshall <jmarshall@never.you.mind> | 2013-01-23 21:37:08 +1300 |
| commit | 6e34f47d7ae5941b25e3cd14fdeb19fc16bc72d2 (patch) | |
| tree | a384e3eacc1e2c010f953d48b4b48605dd043bf8 | |
| parent | 18e1330b41e140ba7b169e55d2d136ff808dc3b2 (diff) | |
.mpc file tags (apev2) weren't read correctly. fixes #13985
| -rw-r--r-- | xbmc/music/tags/TagLoaderTagLib.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xbmc/music/tags/TagLoaderTagLib.cpp b/xbmc/music/tags/TagLoaderTagLib.cpp index 0ed12421dc..cc8405ddcd 100644 --- a/xbmc/music/tags/TagLoaderTagLib.cpp +++ b/xbmc/music/tags/TagLoaderTagLib.cpp @@ -199,6 +199,8 @@ bool CTagLoaderTagLib::Load(const string& strFileName, CMusicInfoTag& tag, Embed id3v2 = ttaFile->ID3v2Tag(false); else if (wvFile) ape = wvFile->APETag(false); + else if (mpcFile) + ape = mpcFile->APETag(false); else // This is a catch all to get generic information for other files types (s3m, xm, it, mod, etc) generic = file->tag(); @@ -456,11 +458,11 @@ bool CTagLoaderTagLib::ParseAPETag(APE::Tag *ape, EmbeddedArt *art, CMusicInfoTa for (APE::ItemListMap::ConstIterator it = itemListMap.begin(); it != itemListMap.end(); ++it) { if (it->first == "ARTIST") SetArtist(tag, StringListToVectorString(it->second.toStringList())); - else if (it->first == "ALBUM ARTIST") SetAlbumArtist(tag, StringListToVectorString(it->second.toStringList())); + else if (it->first == "ALBUM ARTIST" || it->first == "ALBUMARTIST") SetAlbumArtist(tag, StringListToVectorString(it->second.toStringList())); else if (it->first == "ALBUM") tag.SetAlbum(it->second.toString().to8Bit(true)); else if (it->first == "TITLE") tag.SetTitle(it->second.toString().to8Bit(true)); else if (it->first == "TRACKNUMBER" || it->first == "TRACK") tag.SetTrackNumber(it->second.toString().toInt()); - else if (it->first == "DISCNUMBER") tag.SetPartOfSet(it->second.toString().toInt()); + else if (it->first == "DISCNUMBER" || it->first == "DISC") tag.SetPartOfSet(it->second.toString().toInt()); else if (it->first == "YEAR") tag.SetYear(it->second.toString().toInt()); else if (it->first == "GENRE") SetGenre(tag, StringListToVectorString(it->second.toStringList())); else if (it->first == "COMMENT") tag.SetComment(it->second.toString().to8Bit(true)); |