Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #373 from wylfen/master

Browse Source 
Stop using deprecated removeField method
This commit is contained in:
Andrzej Rybczak
2020-01-12 12:35:13 +01:00
committed by GitHub
parent 69ec9aef63 5e54cf2ca3
commit bdec1eb009
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/tags.cpp
View File

@@ -173,18 +173,17 @@ void writeID3v2Tags(const MPD::MutableSong &s, TagLib::ID3v2::Tag *tag)
void writeXiphComments(const MPD::MutableSong &s, TagLib::Ogg::XiphComment *tag) void writeXiphComments(const MPD::MutableSong &s, TagLib::Ogg::XiphComment *tag)
{ {
auto writeXiph = [&](const TagLib::String &type, const TagLib::StringList &list) { auto writeXiph = [&](const TagLib::String &type, const TagLib::StringList &list) {
tag->removeField(type);
for (auto it = list.begin(); it != list.end(); ++it) for (auto it = list.begin(); it != list.end(); ++it)
tag->addField(type, *it, false); tag->addField(type, *it);
}; };
// remove field previously used as album artist // remove field previously used as album artist
tag->removeField("ALBUM ARTIST"); tag->removeFields("ALBUM ARTIST");
// remove field TRACK, some taggers use it as TRACKNUMBER // remove field TRACK, some taggers use it as TRACKNUMBER
tag->removeField("TRACK"); tag->removeFields("TRACK");
// remove field DISC, some taggers use it as DISCNUMBER // remove field DISC, some taggers use it as DISCNUMBER
tag->removeField("DISC"); tag->removeFields("DISC");
// remove field DESCRIPTION, it's displayed as COMMENT // remove field DESCRIPTION, it's displayed as COMMENT
tag->removeField("DESCRIPTION"); tag->removeFields("DESCRIPTION");
writeXiph("TITLE", tagList(s, &MPD::Song::getTitle)); writeXiph("TITLE", tagList(s, &MPD::Song::getTitle));
writeXiph("ARTIST", tagList(s, &MPD::Song::getArtist)); writeXiph("ARTIST", tagList(s, &MPD::Song::getArtist));
writeXiph("ALBUMARTIST", tagList(s, &MPD::Song::getAlbumArtist)); writeXiph("ALBUMARTIST", tagList(s, &MPD::Song::getAlbumArtist));