diff options
| -rw-r--r-- | src/plugins/General/fileops/translations/fileops_plugin_tr.ts | 1 | ||||
| -rw-r--r-- | src/plugins/Input/flac/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/Input/flac/flac.pro | 6 | ||||
| -rw-r--r-- | src/plugins/Input/flac/replaygainreader.cpp | 61 | ||||
| -rw-r--r-- | src/plugins/Input/flac/replaygainreader.h | 44 | ||||
| -rw-r--r-- | src/plugins/Input/wavpack/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/Input/wavpack/replaygainreader.cpp | 84 | ||||
| -rw-r--r-- | src/plugins/Input/wavpack/replaygainreader.h | 47 | ||||
| -rw-r--r-- | src/plugins/Input/wavpack/wavpack.pro | 6 |
9 files changed, 248 insertions, 5 deletions
diff --git a/src/plugins/General/fileops/translations/fileops_plugin_tr.ts b/src/plugins/General/fileops/translations/fileops_plugin_tr.ts index 88ef5d138..461ca833b 100644 --- a/src/plugins/General/fileops/translations/fileops_plugin_tr.ts +++ b/src/plugins/General/fileops/translations/fileops_plugin_tr.ts @@ -38,7 +38,6 @@ <source>Are you sure you want to remove %n file(s) from disk?</source> <translation type="unfinished"> <numerusform></numerusform> - <numerusform></numerusform> </translation> </message> </context> diff --git a/src/plugins/Input/flac/CMakeLists.txt b/src/plugins/Input/flac/CMakeLists.txt index 5585a747a..bb5d09175 100644 --- a/src/plugins/Input/flac/CMakeLists.txt +++ b/src/plugins/Input/flac/CMakeLists.txt @@ -41,6 +41,7 @@ SET(libflac_SRCS decoderflacfactory.cpp flacmetadatamodel.cpp cueparser.cpp + replaygainreader.cpp ) SET(libflac_MOC_HDRS @@ -48,6 +49,7 @@ SET(libflac_MOC_HDRS decoder_flac.h flacmetadatamodel.h cueparser.h + replaygainreader.h ) SET(libflac_RCCS translations/translations.qrc) diff --git a/src/plugins/Input/flac/flac.pro b/src/plugins/Input/flac/flac.pro index 7a8573c38..993747bf3 100644 --- a/src/plugins/Input/flac/flac.pro +++ b/src/plugins/Input/flac/flac.pro @@ -3,11 +3,13 @@ FORMS += HEADERS += decoderflacfactory.h \ decoder_flac.h \ cueparser.h \ - flacmetadatamodel.h + flacmetadatamodel.h \ + replaygainreader.h SOURCES += decoder_flac.cpp \ decoderflacfactory.cpp \ cueparser.cpp \ - flacmetadatamodel.cpp + flacmetadatamodel.cpp \ + replaygainreader.cpp TARGET = $$PLUGINS_PREFIX/Input/flac QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libflac.so INCLUDEPATH += ../../../ diff --git a/src/plugins/Input/flac/replaygainreader.cpp b/src/plugins/Input/flac/replaygainreader.cpp new file mode 100644 index 000000000..27361e12b --- /dev/null +++ b/src/plugins/Input/flac/replaygainreader.cpp @@ -0,0 +1,61 @@ +/*************************************************************************** + * Copyright (C) 2009 by Ilya Kotov * + * forkotov02@hotmail.ru * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +#include <QtGlobal> +#include <taglib/tag.h> +#include <taglib/fileref.h> +#include <taglib/flacfile.h> +#include "replaygainreader.h" + +ReplayGainReader::ReplayGainReader(const QString &path) +{ + TagLib::FLAC::File fileRef(path.toLocal8Bit ().constData()); + if(fileRef.xiphComment()) + readVorbisComment(fileRef.xiphComment()); +} + +QMap <Qmmp::ReplayGainKey, double> ReplayGainReader::replayGainInfo() const +{ + return m_values; +} + +void ReplayGainReader::readVorbisComment(TagLib::Ogg::XiphComment *comment) +{ + TagLib::Ogg::FieldListMap items = comment->fieldListMap(); + if (items.contains("REPLAYGAIN_TRACK_GAIN")) + setValue(Qmmp::REPLAYGAIN_TRACK_GAIN,TStringToQString(items["REPLAYGAIN_TRACK_GAIN"].front())); + if (items.contains("REPLAYGAIN_TRACK_PEAK")) + setValue(Qmmp::REPLAYGAIN_TRACK_PEAK,TStringToQString(items["REPLAYGAIN_TRACK_PEAK"].front())); + if (items.contains("REPLAYGAIN_ALBUM_GAIN")) + setValue(Qmmp::REPLAYGAIN_ALBUM_GAIN,TStringToQString(items["REPLAYGAIN_ALBUM_GAIN"].front())); + if (items.contains("REPLAYGAIN_ALBUM_PEAK")) + setValue(Qmmp::REPLAYGAIN_ALBUM_PEAK,TStringToQString(items["REPLAYGAIN_ALBUM_PEAK"].front())); +} + +void ReplayGainReader::setValue(Qmmp::ReplayGainKey key, QString value) +{ + value.remove(" dB"); + if(value.isEmpty()) + return; + bool ok; + double v = value.toDouble(&ok); + if(ok) + m_values[key] = v; +} diff --git a/src/plugins/Input/flac/replaygainreader.h b/src/plugins/Input/flac/replaygainreader.h new file mode 100644 index 000000000..98a22b5d7 --- /dev/null +++ b/src/plugins/Input/flac/replaygainreader.h @@ -0,0 +1,44 @@ +/*************************************************************************** + * Copyright (C) 2009 by Ilya Kotov * + * forkotov02@hotmail.ru * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +#ifndef REPLAYGAINREADER_H +#define REPLAYGAINREADER_H + +#include <QMap> +#include <QString> +#include <taglib/xiphcomment.h> +#include <qmmp/qmmp.h> + +/** + @author Ilya Kotov <forkotov02@hotmail.ru> +*/ +class ReplayGainReader +{ +public: + ReplayGainReader(const QString &path); + QMap <Qmmp::ReplayGainKey, double> replayGainInfo() const; + +private: + void readVorbisComment(TagLib::Ogg::XiphComment *comment); + void setValue(Qmmp::ReplayGainKey key, QString value); + QMap <Qmmp::ReplayGainKey, double> m_values; +}; + +#endif // REPLAYGAINREADER_H diff --git a/src/plugins/Input/wavpack/CMakeLists.txt b/src/plugins/Input/wavpack/CMakeLists.txt index 0d7566265..46e9d1612 100644 --- a/src/plugins/Input/wavpack/CMakeLists.txt +++ b/src/plugins/Input/wavpack/CMakeLists.txt @@ -36,6 +36,7 @@ SET(libwavpack_SRCS decoderwavpackfactory.cpp wavpackmetadatamodel.cpp cueparser.cpp + replaygainreader.cpp ) SET(libwavpack_MOC_HDRS @@ -43,6 +44,7 @@ SET(libwavpack_MOC_HDRS decoder_wavpack.h wavpackmetadatamodel.h cueparser.h + replaygainreader.h ) SET(libwavpack_RCCS translations/translations.qrc) diff --git a/src/plugins/Input/wavpack/replaygainreader.cpp b/src/plugins/Input/wavpack/replaygainreader.cpp new file mode 100644 index 000000000..08a0e8cd5 --- /dev/null +++ b/src/plugins/Input/wavpack/replaygainreader.cpp @@ -0,0 +1,84 @@ +/*************************************************************************** + * Copyright (C) 2009 by Ilya Kotov * + * forkotov02@hotmail.ru * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +#include <QtGlobal> +#include <taglib/wavpackfile.h> +#include <taglib/tag.h> +#include "replaygainreader.h" + +ReplayGainReader::ReplayGainReader(const QString &path) +{ + if(path.contains("://")) + { + QString p = QUrl(path).path(); + p.replace(QString(QUrl::toPercentEncoding("#")), "#"); + p.replace(QString(QUrl::toPercentEncoding("?")), "?"); + p.replace(QString(QUrl::toPercentEncoding("%")), "%"); + m_path = p; + } + else + m_path = path; + + char err[80]; + m_ctx = WavpackOpenFileInput (m_path.toLocal8Bit(), err, + OPEN_WVC | OPEN_EDIT_TAGS, 0); + if (!m_ctx) + { + qWarning("WavPackMetaDataModel: error: %s", err); + return; + } + readAPE(); +} + +ReplayGainReader::~ReplayGainReader() +{ + if(m_ctx) + WavpackCloseFile (m_ctx); +} + +QMap <Qmmp::ReplayGainKey, double> ReplayGainReader::replayGainInfo() const +{ + return m_values; +} + +void ReplayGainReader::readAPE() +{ + char value[200]; + WavpackGetTagItem (m_ctx, "REPLAYGAIN_TRACK_GAIN", value, sizeof(value)); + setValue(Qmmp::REPLAYGAIN_TRACK_GAIN, value); + WavpackGetTagItem (m_ctx, "REPLAYGAIN_TRACK_PEAK", value, sizeof(value)); + setValue(Qmmp::REPLAYGAIN_TRACK_PEAK, value); + WavpackGetTagItem (m_ctx, "REPLAYGAIN_ALBUM_GAIN", value, sizeof(value)); + setValue(Qmmp::REPLAYGAIN_ALBUM_GAIN, value); + WavpackGetTagItem (m_ctx, "REPLAYGAIN_ALBUM_PEAK", value, sizeof(value)); + setValue(Qmmp::REPLAYGAIN_ALBUM_PEAK, value); +} + +void ReplayGainReader::setValue(Qmmp::ReplayGainKey key, QString value) +{ + value.remove(" dB"); + value = value.trimmed(); + if(value.isEmpty()) + return; + bool ok; + double v = value.toDouble(&ok); + if(ok) + m_values[key] = v; +} diff --git a/src/plugins/Input/wavpack/replaygainreader.h b/src/plugins/Input/wavpack/replaygainreader.h new file mode 100644 index 000000000..0423e1c43 --- /dev/null +++ b/src/plugins/Input/wavpack/replaygainreader.h @@ -0,0 +1,47 @@ +/*************************************************************************** + * Copyright (C) 2009 by Ilya Kotov * + * forkotov02@hotmail.ru * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ + +#ifndef REPLAYGAINREADER_H +#define REPLAYGAINREADER_H + +#include <QMap> +#include <QString> +#include <wavpack/wavpack.h> +#include <qmmp/qmmp.h> + +/** + @author Ilya Kotov <forkotov02@hotmail.ru> +*/ +class ReplayGainReader +{ +public: + ReplayGainReader(const QString &path); + ~ReplayGainReader(); + QMap <Qmmp::ReplayGainKey, double> replayGainInfo() const; + +private: + void readAPE(); + void setValue(Qmmp::ReplayGainKey key, QString value); + QMap <Qmmp::ReplayGainKey, double> m_values; + WavpackContext *m_ctx; + QString m_path; +}; + +#endif // REPLAYGAINREADER_H diff --git a/src/plugins/Input/wavpack/wavpack.pro b/src/plugins/Input/wavpack/wavpack.pro index 6f94a39d8..092153163 100644 --- a/src/plugins/Input/wavpack/wavpack.pro +++ b/src/plugins/Input/wavpack/wavpack.pro @@ -3,11 +3,13 @@ FORMS += HEADERS += decoderwavpackfactory.h \ decoder_wavpack.h \ cueparser.h \ - wavpackmetadatamodel.h + wavpackmetadatamodel.h \ + replaygainreader.h SOURCES += decoder_wavpack.cpp \ decoderwavpackfactory.cpp \ cueparser.cpp \ - wavpackmetadatamodel.cpp + wavpackmetadatamodel.cpp \ + replaygainreader.cpp TARGET = $$PLUGINS_PREFIX/Input/wavpack QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libwavpack.so INCLUDEPATH += ../../../ |
