removed unused code

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7961 90c681e8-e032-0410-971d-27865f9a5e38

12 files changed, 15 insertions, 281 deletions

diff --git a/src/plugins/Input/mpeg/decodermpegfactory.cpp b/src/plugins/Input/mpeg/decodermpegfactory.cpp
index a9bb30744..6c841e7f1 100644
--- a/src/plugins/Input/mpeg/decodermpegfactory.cpp
+++ b/src/plugins/Input/mpeg/decodermpegfactory.cpp
@@ -37,7 +37,6 @@
 #include <taglib/textidentificationframe.h>
 #include <taglib/id3v2framefactory.h>
 #include "mpegmetadatamodel.h"
-#include "replaygainreader.h"
 #include "settingsdialog.h"
 #ifdef WITH_MAD
 #include "decoder_mad.h"
@@ -175,7 +174,7 @@ const DecoderProperties DecoderMPEGFactory::properties() const
     return properties;
 }
 
-Decoder *DecoderMPEGFactory::create(const QString &url, QIODevice *input)
+Decoder *DecoderMPEGFactory::create(const QString &, QIODevice *input)
 {
     Decoder *d = 0;
 #if defined(WITH_MAD) && defined(WITH_MPG123)
@@ -195,12 +194,6 @@ Decoder *DecoderMPEGFactory::create(const QString &url, QIODevice *input)
 #elif defined(WITH_MPG123)
     d = new DecoderMPG123(input);
 #endif
-
-    if(d && !url.contains("://")) //local file
-    {
-        ReplayGainReader rg(url);
-        d->setReplayGainInfo(rg.replayGainInfo());
-    }
     return d;
 }
 
diff --git a/src/plugins/Input/mpeg/decodermpegfactory.h b/src/plugins/Input/mpeg/decodermpegfactory.h
index 6bea0eee6..149673daa 100644
--- a/src/plugins/Input/mpeg/decodermpegfactory.h
+++ b/src/plugins/Input/mpeg/decodermpegfactory.h
@@ -33,7 +33,7 @@ public:
     DecoderMPEGFactory();
     bool canDecode(QIODevice *input) const;
     const DecoderProperties properties() const;
-    Decoder *create(const QString &path, QIODevice *input);
+    Decoder *create(const QString &, QIODevice *input);
     QList<TrackInfo *> createPlayList(const QString &fileName, TrackInfo::Parts parts, QStringList *);
     MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0);
     void showSettings(QWidget *parent);
diff --git a/src/plugins/Input/mpeg/mpeg.pro b/src/plugins/Input/mpeg/mpeg.pro
index 59f5322ba..795abf516 100644
--- a/src/plugins/Input/mpeg/mpeg.pro
+++ b/src/plugins/Input/mpeg/mpeg.pro
@@ -5,14 +5,12 @@ TARGET = $$PLUGINS_PREFIX/Input/mpeg
 HEADERS += decodermpegfactory.h \
     settingsdialog.h \
     tagextractor.h \
-    mpegmetadatamodel.h \
-    replaygainreader.h
+    mpegmetadatamodel.h
 
 SOURCES += decodermpegfactory.cpp \
     settingsdialog.cpp \
     tagextractor.cpp \
-    mpegmetadatamodel.cpp \
-    replaygainreader.cpp
+    mpegmetadatamodel.cpp
 
 contains(CONFIG, WITH_MAD){
     HEADERS += decoder_mad.h
diff --git a/src/plugins/Input/mpeg/replaygainreader.cpp b/src/plugins/Input/mpeg/replaygainreader.cpp
deleted file mode 100644
index e66734562..000000000
--- a/src/plugins/Input/mpeg/replaygainreader.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2009-2018 by Ilya Kotov                                 *
- *   forkotov02@ya.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.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
- ***************************************************************************/
-
-#include <QtGlobal>
-#include <taglib/mpegfile.h>
-#include <taglib/id3v2tag.h>
-#include <taglib/tag.h>
-#include <taglib/id3v1tag.h>
-#include <taglib/id3v2header.h>
-#include <taglib/textidentificationframe.h>
-#include <taglib/tfilestream.h>
-#include <taglib/id3v2framefactory.h>
-#include "replaygainreader.h"
-
-ReplayGainReader::ReplayGainReader(const QString &path)
-{
-    TagLib::FileStream stream(QStringToFileName(path), true);
-    TagLib::MPEG::File fileRef(&stream, TagLib::ID3v2::FrameFactory::instance());
-    if(fileRef.ID3v2Tag())
-        readID3v2(fileRef.ID3v2Tag());
-    if(m_values.isEmpty() && fileRef.APETag())
-        readAPE(fileRef.APETag());
-}
-
-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->frameList("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"))
-        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]));
-    if (items.contains("REPLAYGAIN_ALBUM_GAIN"))
-        setValue(Qmmp::REPLAYGAIN_ALBUM_GAIN,TStringToQString(items["REPLAYGAIN_ALBUM_GAIN"].values()[0]));
-    if (items.contains("REPLAYGAIN_ALBUM_PEAK"))
-        setValue(Qmmp::REPLAYGAIN_ALBUM_PEAK,TStringToQString(items["REPLAYGAIN_ALBUM_PEAK"].values()[0]));
-}
-
-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/mpeg/replaygainreader.h b/src/plugins/Input/mpeg/replaygainreader.h
deleted file mode 100644
index d0bfa8f6a..000000000
--- a/src/plugins/Input/mpeg/replaygainreader.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2009-2018 by Ilya Kotov                                 *
- *   forkotov02@ya.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.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
- ***************************************************************************/
-
-#ifndef REPLAYGAINREADER_H
-#define REPLAYGAINREADER_H
-
-#include <QMap>
-#include <QString>
-#include <taglib/apetag.h>
-#include <taglib/id3v2tag.h>
-#include <qmmp/qmmp.h>
-
-/**
-    @author Ilya Kotov <forkotov02@ya.ru>
-*/
-class ReplayGainReader
-{
-public:
-    ReplayGainReader(const QString &path);
-    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;
-};
-
-#endif // REPLAYGAINREADER_H
diff --git a/src/plugins/Input/vorbis/decoder_vorbis.cpp b/src/plugins/Input/vorbis/decoder_vorbis.cpp
index 06de8b3e1..063398500 100644
--- a/src/plugins/Input/vorbis/decoder_vorbis.cpp
+++ b/src/plugins/Input/vorbis/decoder_vorbis.cpp
@@ -68,14 +68,13 @@ static long oggtell(void *src)
 
 // Decoder class
 
-DecoderVorbis::DecoderVorbis(const QString &url, QIODevice *i)
+DecoderVorbis::DecoderVorbis(QIODevice *i)
         : Decoder(i)
 {
     m_inited = false;
     m_totalTime = 0;
     m_last_section = -1;
     m_bitrate = 0;
-    m_url = url;
     len = 0;
     memset(&oggfile, 0, sizeof(OggVorbis_File));
 }
diff --git a/src/plugins/Input/vorbis/decoder_vorbis.h b/src/plugins/Input/vorbis/decoder_vorbis.h
index 82ed9b3d5..95065522b 100644
--- a/src/plugins/Input/vorbis/decoder_vorbis.h
+++ b/src/plugins/Input/vorbis/decoder_vorbis.h
@@ -15,7 +15,7 @@
 class DecoderVorbis : public Decoder
 {
 public:
-    DecoderVorbis(const QString &url, QIODevice *i);
+    DecoderVorbis(QIODevice *i);
     virtual ~DecoderVorbis();
 
     // Standard Decoder API
@@ -39,7 +39,6 @@ private:
     int m_last_section;
     int m_bitrate;
     bool m_inited;
-    QString m_url;
 };
 
 
diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.cpp b/src/plugins/Input/vorbis/decodervorbisfactory.cpp
index 0f74e09a7..0314bc759 100644
--- a/src/plugins/Input/vorbis/decodervorbisfactory.cpp
+++ b/src/plugins/Input/vorbis/decodervorbisfactory.cpp
@@ -24,7 +24,6 @@
 #include <taglib/fileref.h>
 #include <taglib/vorbisfile.h>
 #include <taglib/tfilestream.h>
-#include "replaygainreader.h"
 #include "decoder_vorbis.h"
 #include "vorbismetadatamodel.h"
 #include "decodervorbisfactory.h"
@@ -54,15 +53,9 @@ const DecoderProperties DecoderVorbisFactory::properties() const
     return properties;
 }
 
-Decoder *DecoderVorbisFactory::create(const QString &url, QIODevice *input)
+Decoder *DecoderVorbisFactory::create(const QString &, QIODevice *input)
 {
-    Decoder *d = new DecoderVorbis(url, input);
-    if(!url.contains("://")) //local file
-    {
-        ReplayGainReader rg(url);
-        d->setReplayGainInfo(rg.replayGainInfo());
-    }
-    return d;
+    return new DecoderVorbis(input);
 }
 
 MetaDataModel* DecoderVorbisFactory::createMetaDataModel(const QString &path, QObject *parent)
@@ -106,13 +99,13 @@ QList<TrackInfo *> DecoderVorbisFactory::createPlayList(const QString &fileName,
         TagLib::Ogg::XiphComment *tag = fileRef.tag();
         TagLib::Ogg::FieldListMap items = tag->fieldListMap();
         if(items.contains("REPLAYGAIN_TRACK_GAIN"))
-            info->setValue(Qmmp::REPLAYGAIN_TRACK_GAIN,TStringToQString(items["REPLAYGAIN_TRACK_GAIN"].front()));
+            info->setValue(Qmmp::REPLAYGAIN_TRACK_GAIN, TStringToQString(items["REPLAYGAIN_TRACK_GAIN"].front()));
         if(items.contains("REPLAYGAIN_TRACK_PEAK"))
-            info->setValue(Qmmp::REPLAYGAIN_TRACK_PEAK,TStringToQString(items["REPLAYGAIN_TRACK_PEAK"].front()));
+            info->setValue(Qmmp::REPLAYGAIN_TRACK_PEAK, TStringToQString(items["REPLAYGAIN_TRACK_PEAK"].front()));
         if(items.contains("REPLAYGAIN_ALBUM_GAIN"))
-            info->setValue(Qmmp::REPLAYGAIN_ALBUM_GAIN,TStringToQString(items["REPLAYGAIN_ALBUM_GAIN"].front()));
+            info->setValue(Qmmp::REPLAYGAIN_ALBUM_GAIN, TStringToQString(items["REPLAYGAIN_ALBUM_GAIN"].front()));
         if(items.contains("REPLAYGAIN_ALBUM_PEAK"))
-            info->setValue(Qmmp::REPLAYGAIN_ALBUM_PEAK,TStringToQString(items["REPLAYGAIN_ALBUM_PEAK"].front()));
+            info->setValue(Qmmp::REPLAYGAIN_ALBUM_PEAK, TStringToQString(items["REPLAYGAIN_ALBUM_PEAK"].front()));
     }
 
     return QList<TrackInfo*>() << info;
diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.h b/src/plugins/Input/vorbis/decodervorbisfactory.h
index 89b32b650..b2d13101d 100644
--- a/src/plugins/Input/vorbis/decodervorbisfactory.h
+++ b/src/plugins/Input/vorbis/decodervorbisfactory.h
@@ -35,7 +35,7 @@ Q_INTERFACES(DecoderFactory)
 public:
     bool canDecode(QIODevice *input) const;
     const DecoderProperties properties() const;
-    Decoder *create(const QString &path, QIODevice *input);
+    Decoder *create(const QString &, QIODevice *input);
     MetaDataModel* createMetaDataModel(const QString &path, QObject *parent = 0);
     QList<TrackInfo *> createPlayList(const QString &fileName, TrackInfo::Parts parts, QStringList *);
     QObject* showDetails(QWidget *parent, const QString &path);
diff --git a/src/plugins/Input/vorbis/replaygainreader.cpp b/src/plugins/Input/vorbis/replaygainreader.cpp
deleted file mode 100644
index 276848d80..000000000
--- a/src/plugins/Input/vorbis/replaygainreader.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2009-2016 by Ilya Kotov                                 *
- *   forkotov02@ya.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.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
- ***************************************************************************/
-
-#include <QtGlobal>
-#include <taglib/tag.h>
-#include <taglib/fileref.h>
-#include <taglib/vorbisfile.h>
-#include <taglib/tfilestream.h>
-#include <taglib/id3v2framefactory.h>
-#include "replaygainreader.h"
-
-ReplayGainReader::ReplayGainReader(const QString &path)
-{
-    TagLib::FileStream stream(QStringToFileName(path), true);
-    TagLib::Ogg::Vorbis::File fileRef(&stream);
-
-    if(fileRef.tag())
-        readVorbisComment(fileRef.tag());
-}
-
-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/vorbis/replaygainreader.h b/src/plugins/Input/vorbis/replaygainreader.h
deleted file mode 100644
index 75f2037ba..000000000
--- a/src/plugins/Input/vorbis/replaygainreader.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2009 by Ilya Kotov                                      *
- *   forkotov02@ya.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.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
- ***************************************************************************/
-
-#ifndef REPLAYGAINREADER_H
-#define REPLAYGAINREADER_H
-
-#include <QMap>
-#include <QString>
-#include <taglib/xiphcomment.h>
-#include <qmmp/qmmp.h>
-
-/**
-    @author Ilya Kotov <forkotov02@ya.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/vorbis/vorbis.pro b/src/plugins/Input/vorbis/vorbis.pro
index 70711fa4c..8d3b683c7 100644
--- a/src/plugins/Input/vorbis/vorbis.pro
+++ b/src/plugins/Input/vorbis/vorbis.pro
@@ -4,13 +4,11 @@ TARGET = $$PLUGINS_PREFIX/Input/vorbis
 
 HEADERS += decodervorbisfactory.h \
     decoder_vorbis.h \
-    vorbismetadatamodel.h \
-    replaygainreader.h
+    vorbismetadatamodel.h
 
 SOURCES += decoder_vorbis.cpp \
     decodervorbisfactory.cpp \
-    vorbismetadatamodel.cpp \
-    replaygainreader.cpp
+    vorbismetadatamodel.cpp
 
 RESOURCES = translations/translations.qrc