diff options
| -rw-r--r-- | src/plugins/Input/mad/mpegmetadatamodel.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Input/mad/replaygainreader.cpp | 32 | ||||
| -rw-r--r-- | src/plugins/Input/mad/replaygainreader.h | 2 |
3 files changed, 32 insertions, 6 deletions
diff --git a/src/plugins/Input/mad/mpegmetadatamodel.cpp b/src/plugins/Input/mad/mpegmetadatamodel.cpp index c7a367fc8..0fb6d674a 100644 --- a/src/plugins/Input/mad/mpegmetadatamodel.cpp +++ b/src/plugins/Input/mad/mpegmetadatamodel.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009 by Ilya Kotov * + * Copyright (C) 2009-2013 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -119,7 +119,7 @@ QPixmap MPEGMetaDataModel::cover() for(TagLib::ID3v2::FrameList::Iterator it = frames.begin(); it != frames.end(); ++it) { - TagLib::ID3v2::AttachedPictureFrame *frame = static_cast<TagLib::ID3v2::AttachedPictureFrame *>(*it); + TagLib::ID3v2::AttachedPictureFrame *frame = dynamic_cast<TagLib::ID3v2::AttachedPictureFrame *>(*it); if(frame && frame->type() == TagLib::ID3v2::AttachedPictureFrame::FrontCover) { QPixmap cover; diff --git a/src/plugins/Input/mad/replaygainreader.cpp b/src/plugins/Input/mad/replaygainreader.cpp index 20a489a1d..c4f78ef70 100644 --- a/src/plugins/Input/mad/replaygainreader.cpp +++ b/src/plugins/Input/mad/replaygainreader.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009 by Ilya Kotov * + * Copyright (C) 2009-2013 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -24,12 +24,14 @@ #include <taglib/tag.h> #include <taglib/id3v1tag.h> #include <taglib/id3v2header.h> +#include <taglib/textidentificationframe.h> #include "replaygainreader.h" ReplayGainReader::ReplayGainReader(const QString &path) { - TagLib::MPEG::File fileRef(path.toLocal8Bit ().constData()); - if(fileRef.APETag()) + TagLib::MPEG::File fileRef(path.toLocal8Bit().constData()); + readID3v2(fileRef.ID3v2Tag()); + if(m_values.isEmpty() && fileRef.APETag()) readAPE(fileRef.APETag()); } @@ -38,10 +40,32 @@ QMap <Qmmp::ReplayGainKey, double> ReplayGainReader::replayGainInfo() const return m_values; } +void ReplayGainReader::readID3v2(TagLib::ID3v2::Tag *tag) +{ + TagLib::ID3v2::UserTextIdentificationFrame* frame = 0; + TagLib::ID3v2::FrameList frames = tag->frameListMap()["TXXX"]; + for(TagLib::ID3v2::FrameList::Iterator it = frames.begin(); it != frames.end(); ++it) + { + frame = dynamic_cast<TagLib::ID3v2::UserTextIdentificationFrame*>(*it); + if(frame && frame->fieldList().size() >= 2) + { + TagLib::String desc = frame->description().upper(); + if (desc == "REPLAYGAIN_TRACK_GAIN") + setValue(Qmmp::REPLAYGAIN_TRACK_GAIN, TStringToQString(frame->fieldList()[1])); + else if (desc == "REPLAYGAIN_TRACK_PEAK") + setValue(Qmmp::REPLAYGAIN_TRACK_PEAK, TStringToQString(frame->fieldList()[1])); + else if (desc == "REPLAYGAIN_ALBUM_GAIN") + setValue(Qmmp::REPLAYGAIN_ALBUM_GAIN, TStringToQString(frame->fieldList()[1])); + else if (desc == "REPLAYGAIN_ALBUM_PEAK") + setValue(Qmmp::REPLAYGAIN_ALBUM_PEAK, TStringToQString(frame->fieldList()[1])); + } + } +} + void ReplayGainReader::readAPE(TagLib::APE::Tag *tag) { TagLib::APE::ItemListMap items = tag->itemListMap(); - if (items.contains("REPLAYGAIN_TRACK_GAIN")) + if (items.contains("REPLAYGAIN_TRACK_GAIN")) setValue(Qmmp::REPLAYGAIN_TRACK_GAIN,TStringToQString(items["REPLAYGAIN_TRACK_GAIN"].values()[0])); if (items.contains("REPLAYGAIN_TRACK_PEAK")) setValue(Qmmp::REPLAYGAIN_TRACK_PEAK,TStringToQString(items["REPLAYGAIN_TRACK_PEAK"].values()[0])); diff --git a/src/plugins/Input/mad/replaygainreader.h b/src/plugins/Input/mad/replaygainreader.h index f97fc8980..513ccefe5 100644 --- a/src/plugins/Input/mad/replaygainreader.h +++ b/src/plugins/Input/mad/replaygainreader.h @@ -24,6 +24,7 @@ #include <QMap> #include <QString> #include <taglib/apetag.h> +#include <taglib/id3v2tag.h> #include <qmmp/qmmp.h> /** @@ -36,6 +37,7 @@ public: QMap <Qmmp::ReplayGainKey, double> replayGainInfo() const; private: + void readID3v2(TagLib::ID3v2::Tag *tag); void readAPE(TagLib::APE::Tag *tag); void setValue(Qmmp::ReplayGainKey key, QString value); QMap <Qmmp::ReplayGainKey, double> m_values; |