From cd9b7642cf356ce1cb2903ee8676c68eac9cd692 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 28 Dec 2023 05:15:22 +0000 Subject: TagLoaderTagLib: migrate from APE::Item::toStringList(): use values() ref: - https://github.com/taglib/taglib/commit/10094f66b938ab0e444e2c28cd6bf9871f1f075e Signed-off-by: Rudi Heitbaum (cherry picked from commit 6f5dff4b4916fa4e6334b0dda5e512fe24f6c91e) --- xbmc/music/tags/TagLoaderTagLib.cpp | 50 ++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/xbmc/music/tags/TagLoaderTagLib.cpp b/xbmc/music/tags/TagLoaderTagLib.cpp index 6eb591a0c4..c1b36318b2 100644 --- a/xbmc/music/tags/TagLoaderTagLib.cpp +++ b/xbmc/music/tags/TagLoaderTagLib.cpp @@ -500,19 +500,19 @@ bool CTagLoaderTagLib::ParseTag(APE::Tag *ape, EmbeddedArt *art, CMusicInfoTag& for (APE::ItemListMap::ConstIterator it = itemListMap.begin(); it != itemListMap.end(); ++it) { if (it->first == "ARTIST") - SetArtist(tag, StringListToVectorString(it->second.toStringList())); + SetArtist(tag, StringListToVectorString(it->second.values())); else if (it->first == "ARTISTSORT") - SetArtistSort(tag, StringListToVectorString(it->second.toStringList())); + SetArtistSort(tag, StringListToVectorString(it->second.values())); else if (it->first == "ARTISTS") - SetArtistHints(tag, StringListToVectorString(it->second.toStringList())); + SetArtistHints(tag, StringListToVectorString(it->second.values())); else if (it->first == "ALBUMARTIST" || it->first == "ALBUM ARTIST") - SetAlbumArtist(tag, StringListToVectorString(it->second.toStringList())); + SetAlbumArtist(tag, StringListToVectorString(it->second.values())); else if (it->first == "ALBUMARTISTSORT") - SetAlbumArtistSort(tag, StringListToVectorString(it->second.toStringList())); + SetAlbumArtistSort(tag, StringListToVectorString(it->second.values())); else if (it->first == "ALBUMARTISTS" || it->first == "ALBUM ARTISTS") - SetAlbumArtistHints(tag, StringListToVectorString(it->second.toStringList())); + SetAlbumArtistHints(tag, StringListToVectorString(it->second.values())); else if (it->first == "COMPOSERSORT") - SetComposerSort(tag, StringListToVectorString(it->second.toStringList())); + SetComposerSort(tag, StringListToVectorString(it->second.values())); else if (it->first == "ALBUM") tag.SetAlbum(it->second.toString().to8Bit(true)); else if (it->first == "TITLE") @@ -528,7 +528,7 @@ bool CTagLoaderTagLib::ParseTag(APE::Tag *ape, EmbeddedArt *art, CMusicInfoTag& else if (it->first == "ORIGINALYEAR") tag.SetOriginalDate(it->second.toString().to8Bit(true)); else if (it->first == "GENRE") - SetGenre(tag, StringListToVectorString(it->second.toStringList())); + SetGenre(tag, StringListToVectorString(it->second.values())); else if (it->first == "MOOD") tag.SetMood(it->second.toString().to8Bit(true)); else if (it->first == "COMMENT") @@ -538,32 +538,32 @@ bool CTagLoaderTagLib::ParseTag(APE::Tag *ape, EmbeddedArt *art, CMusicInfoTag& else if (it->first == "ENCODEDBY") {} else if (it->first == "COMPOSER") - AddArtistRole(tag, "Composer", StringListToVectorString(it->second.toStringList())); + AddArtistRole(tag, "Composer", StringListToVectorString(it->second.values())); else if (it->first == "CONDUCTOR") - AddArtistRole(tag, "Conductor", StringListToVectorString(it->second.toStringList())); + AddArtistRole(tag, "Conductor", StringListToVectorString(it->second.values())); else if (it->first == "BAND") - AddArtistRole(tag, "Band", StringListToVectorString(it->second.toStringList())); + AddArtistRole(tag, "Band", StringListToVectorString(it->second.values())); else if (it->first == "ENSEMBLE") - AddArtistRole(tag, "Ensemble", StringListToVectorString(it->second.toStringList())); + AddArtistRole(tag, "Ensemble", StringListToVectorString(it->second.values())); else if (it->first == "LYRICIST") - AddArtistRole(tag, "Lyricist", StringListToVectorString(it->second.toStringList())); + AddArtistRole(tag, "Lyricist", StringListToVectorString(it->second.values())); else if (it->first == "WRITER") - AddArtistRole(tag, "Writer", StringListToVectorString(it->second.toStringList())); + AddArtistRole(tag, "Writer", StringListToVectorString(it->second.values())); else if ((it->first == "MIXARTIST") || (it->first == "REMIXER")) - AddArtistRole(tag, "Remixer", StringListToVectorString(it->second.toStringList())); + AddArtistRole(tag, "Remixer", StringListToVectorString(it->second.values())); else if (it->first == "ARRANGER") - AddArtistRole(tag, "Arranger", StringListToVectorString(it->second.toStringList())); + AddArtistRole(tag, "Arranger", StringListToVectorString(it->second.values())); else if (it->first == "ENGINEER") - AddArtistRole(tag, "Engineer", StringListToVectorString(it->second.toStringList())); + AddArtistRole(tag, "Engineer", StringListToVectorString(it->second.values())); else if (it->first == "PRODUCER") - AddArtistRole(tag, "Producer", StringListToVectorString(it->second.toStringList())); + AddArtistRole(tag, "Producer", StringListToVectorString(it->second.values())); else if (it->first == "DJMIXER") - AddArtistRole(tag, "DJMixer", StringListToVectorString(it->second.toStringList())); + AddArtistRole(tag, "DJMixer", StringListToVectorString(it->second.values())); else if (it->first == "MIXER") - AddArtistRole(tag, "Mixer", StringListToVectorString(it->second.toStringList())); + AddArtistRole(tag, "Mixer", StringListToVectorString(it->second.values())); else if (it->first == "PERFORMER") // Picard uses PERFORMER tag as musician credits list formatted "name (instrument)" - AddArtistInstrument(tag, StringListToVectorString(it->second.toStringList())); + AddArtistInstrument(tag, StringListToVectorString(it->second.values())); else if (it->first == "LABEL") tag.SetRecordLabel(it->second.toString().to8Bit(true)); else if (it->first == "COMPILATION") @@ -579,11 +579,11 @@ bool CTagLoaderTagLib::ParseTag(APE::Tag *ape, EmbeddedArt *art, CMusicInfoTag& else if (it->first == "REPLAYGAIN_ALBUM_PEAK") replayGainInfo.ParsePeak(ReplayGain::ALBUM, it->second.toString().toCString(true)); else if (it->first == "MUSICBRAINZ_ARTISTID") - tag.SetMusicBrainzArtistID(SplitMBID(StringListToVectorString(it->second.toStringList()))); + tag.SetMusicBrainzArtistID(SplitMBID(StringListToVectorString(it->second.values()))); else if (it->first == "MUSICBRAINZ_ALBUMARTISTID") - tag.SetMusicBrainzAlbumArtistID(SplitMBID(StringListToVectorString(it->second.toStringList()))); + tag.SetMusicBrainzAlbumArtistID(SplitMBID(StringListToVectorString(it->second.values()))); else if (it->first == "MUSICBRAINZ_ALBUMARTIST") - SetAlbumArtist(tag, StringListToVectorString(it->second.toStringList())); + SetAlbumArtist(tag, StringListToVectorString(it->second.values())); else if (it->first == "MUSICBRAINZ_ALBUMID") tag.SetMusicBrainzAlbumID(it->second.toString().to8Bit(true)); else if (it->first == "MUSICBRAINZ_RELEASEGROUPID") @@ -591,7 +591,7 @@ bool CTagLoaderTagLib::ParseTag(APE::Tag *ape, EmbeddedArt *art, CMusicInfoTag& else if (it->first == "MUSICBRAINZ_TRACKID") tag.SetMusicBrainzTrackID(it->second.toString().to8Bit(true)); else if (it->first == "MUSICBRAINZ_ALBUMTYPE") - SetReleaseType(tag, StringListToVectorString(it->second.toStringList())); + SetReleaseType(tag, StringListToVectorString(it->second.values())); else if (it->first == "BPM") tag.SetBPM(it->second.toString().toInt()); else if (it->first == "MUSICBRAINZ_ALBUMSTATUS") -- cgit v1.2.3