From b6f05218024d7f507b78a9311e410687d8da79b3 Mon Sep 17 00:00:00 2001 From: Robert Gingras Date: Mon, 15 Apr 2024 18:31:16 -0400 Subject: [PATCH] TagReaderTagLib: Reposition ParseID3v2Tag --- ext/libstrawberry-tagreader/tagreadertaglib.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ext/libstrawberry-tagreader/tagreadertaglib.cpp b/ext/libstrawberry-tagreader/tagreadertaglib.cpp index 63381cf6..f69583bb 100644 --- a/ext/libstrawberry-tagreader/tagreadertaglib.cpp +++ b/ext/libstrawberry-tagreader/tagreadertaglib.cpp @@ -579,7 +579,16 @@ bool TagReaderTagLib::ReadFile(const QString &filename, spb::tagreader::SongMeta } +void TagReaderTagLib::TStringToStdString(const TagLib::String &tag, std::string *output) { + + const QString tmp = TStringToQString(tag).trimmed(); + const QByteArray data = tmp.toUtf8(); + output->assign(data.constData(), data.size()); + +} + void TagReaderTagLib::ParseID3v2Tag(TagLib::ID3v2::Tag *tag, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const { + TagLib::ID3v2::FrameListMap map = tag->frameListMap(); if (map.contains("TPOS")) *disc = TStringToQString(map["TPOS"].front()->toString()).trimmed(); @@ -711,14 +720,6 @@ void TagReaderTagLib::ParseID3v2Tag(TagLib::ID3v2::Tag *tag, QString *disc, QStr } -void TagReaderTagLib::TStringToStdString(const TagLib::String &tag, std::string *output) { - - const QString tmp = TStringToQString(tag).trimmed(); - const QByteArray data = tmp.toUtf8(); - output->assign(data.constData(), data.size()); - -} - void TagReaderTagLib::ParseOggTag(const TagLib::Ogg::FieldListMap &map, QString *disc, QString *compilation, spb::tagreader::SongMetadata *song) const { if (map.contains("COMPOSER")) TStringToStdString(map["COMPOSER"].front(), song->mutable_composer());