removed obsolete code

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

6 files changed, 10 insertions, 105 deletions

diff --git a/src/plugins/Input/flac/flacmetadatamodel.cpp b/src/plugins/Input/flac/flacmetadatamodel.cpp
index 16a1b0e88..c20e13d0c 100644
--- a/src/plugins/Input/flac/flacmetadatamodel.cpp
+++ b/src/plugins/Input/flac/flacmetadatamodel.cpp
@@ -25,19 +25,12 @@
 #include <taglib/tmap.h>
 #include <taglib/id3v2framefactory.h>
 #include <taglib/flacpicture.h>
-#ifndef HAS_PICTURE_LIST
-#include <FLAC/all.h>
-#endif
 #include <qmmp/metadatamanager.h>
 #include "flacmetadatamodel.h"
 
-FLACMetaDataModel::FLACMetaDataModel(const QString &path, bool readOnly)
-#ifdef HAS_PICTURE_LIST
-    : MetaDataModel(true, MetaDataModel::IsCoverEditable),
-#else
-    : MetaDataModel(true),
-#endif
-      m_path(path)
+FLACMetaDataModel::FLACMetaDataModel(const QString &path, bool readOnly) :
+    MetaDataModel(true, MetaDataModel::IsCoverEditable),
+    m_path(path)
 {
     if(path.startsWith("flac://"))
     {
@@ -87,7 +80,6 @@ QList<TagModel* > FLACMetaDataModel::tags() const
 
 QPixmap FLACMetaDataModel::cover() const
 {
-#ifdef HAS_PICTURE_LIST
     if(!m_tag || m_tag->isEmpty())
         return QPixmap();
 
@@ -102,22 +94,6 @@ QPixmap FLACMetaDataModel::cover() const
         }
     }
     return QPixmap();
-#else
-    //embedded cover
-     QPixmap cover;
-     FLAC__StreamMetadata *metadata;
-     FLAC__metadata_get_picture (qPrintable(m_path),
-                                 &metadata,
-                                 FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER,
-                                 0,0, -1,-1,-1,-1);
-     if(metadata)
-     {
-         FLAC__StreamMetadata_Picture *pict = &metadata->data.picture;
-         cover.loadFromData(QByteArray((char *)pict->data, (int) pict->data_length));
-         FLAC__metadata_object_delete(metadata);
-     }
-     return cover;
-#endif
 }
 
 QString FLACMetaDataModel::coverPath() const
@@ -125,7 +101,6 @@ QString FLACMetaDataModel::coverPath() const
     return MetaDataManager::instance()->findCoverFile(m_path);
 }
 
-#ifdef HAS_PICTURE_LIST
 void FLACMetaDataModel::setCover(const QPixmap &pix)
 {
     removeCover();
@@ -165,7 +140,6 @@ void FLACMetaDataModel::removeCover()
         }
     }
 }
-#endif
 
 VorbisCommentModel::VorbisCommentModel(TagLib::Ogg::XiphComment *tag, TagLib::File *file) : TagModel(TagModel::Save)
 {
diff --git a/src/plugins/Input/flac/flacmetadatamodel.h b/src/plugins/Input/flac/flacmetadatamodel.h
index 84bced558..6ed1a588d 100644
--- a/src/plugins/Input/flac/flacmetadatamodel.h
+++ b/src/plugins/Input/flac/flacmetadatamodel.h
@@ -27,10 +27,6 @@
 #include <taglib/tfilestream.h>
 #include <qmmp/metadatamodel.h>
 
-#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 11))
-#define HAS_PICTURE_LIST
-#endif
-
 class FLACMetaDataModel : public MetaDataModel
 {
 public:
@@ -39,11 +35,8 @@ public:
     QList<TagModel* > tags() const override;
     QPixmap cover() const override;
     QString coverPath() const override;
-#ifdef HAS_PICTURE_LIST
     void setCover(const QPixmap &pix) override;
     void removeCover() override;
-#endif
-
 
 private:
     QString m_path;
diff --git a/src/plugins/Input/opus/opusmetadatamodel.cpp b/src/plugins/Input/opus/opusmetadatamodel.cpp
index d4dc56d15..ca69bcb6c 100644
--- a/src/plugins/Input/opus/opusmetadatamodel.cpp
+++ b/src/plugins/Input/opus/opusmetadatamodel.cpp
@@ -28,13 +28,9 @@
 #include <taglib/tmap.h>
 #include "opusmetadatamodel.h"
 
-OpusMetaDataModel::OpusMetaDataModel(const QString &path, bool readOnly)
-#ifdef HAS_PICTURE_LIST
-    : MetaDataModel(readOnly, MetaDataModel::IsCoverEditable),
-#else
-    : MetaDataModel(readOnly),
-#endif
-      m_path(path)
+OpusMetaDataModel::OpusMetaDataModel(const QString &path, bool readOnly):
+    MetaDataModel(readOnly, MetaDataModel::IsCoverEditable),
+    m_path(path)
 {
     m_stream = new TagLib::FileStream(QStringToFileName(path), readOnly);
     m_file = new TagLib::Ogg::Opus::File(m_stream);
@@ -75,7 +71,6 @@ QPixmap OpusMetaDataModel::cover() const
     if(!tag || tag->isEmpty())
         return QPixmap();
 
-#ifdef HAS_PICTURE_LIST
     TagLib::List<TagLib::FLAC::Picture *> list = tag->pictureList();
     for(uint i = 0; i < list.size(); ++i)
     {
@@ -86,25 +81,10 @@ QPixmap OpusMetaDataModel::cover() const
             return cover;
         }
     }
-#else
-    TagLib::StringList list = tag->fieldListMap()["METADATA_BLOCK_PICTURE"];
-    if(list.isEmpty())
-        return QPixmap();
-    for(uint i = 0; i < list.size(); ++i)
-    {
-        TagLib::FLAC::Picture pict;
-        TagLib::String value = list[i];
-        QByteArray block = QByteArray::fromBase64(TStringToQString(value).toLatin1());
-        pict.parse(TagLib::ByteVector(block.constData(), block.size()));
-        QPixmap cover;
-        cover.loadFromData(QByteArray(pict.data().data(), pict.data().size())); //read binary picture data
-        return cover;
-    }
-#endif
+
     return QPixmap();
 }
 
-#ifdef HAS_PICTURE_LIST
 void OpusMetaDataModel::setCover(const QPixmap &pix)
 {
     removeCover();
@@ -146,7 +126,6 @@ void OpusMetaDataModel::removeCover()
         }
     }
 }
-#endif
 
 VorbisCommentModel::VorbisCommentModel(TagLib::Ogg::Opus::File *file) : TagModel(TagModel::Save)
 {
diff --git a/src/plugins/Input/opus/opusmetadatamodel.h b/src/plugins/Input/opus/opusmetadatamodel.h
index abfbd8720..81140b8ee 100644
--- a/src/plugins/Input/opus/opusmetadatamodel.h
+++ b/src/plugins/Input/opus/opusmetadatamodel.h
@@ -26,10 +26,6 @@
 #include <taglib/tfilestream.h>
 #include <qmmp/metadatamodel.h>
 
-#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 11))
-#define HAS_PICTURE_LIST
-#endif
-
 class OpusMetaDataModel : public MetaDataModel
 {
     Q_DECLARE_TR_FUNCTIONS(OpusMetaDataModel)
@@ -39,10 +35,8 @@ public:
     QList<MetaDataItem> extraProperties() const override;
     QList<TagModel* > tags() const override;
     QPixmap cover() const override;
-#ifdef HAS_PICTURE_LIST
     void setCover(const QPixmap &pix) override;
     void removeCover() override;
-#endif
 
 private:
     QString m_path;
diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
index cae58d068..6cd4acc3d 100644
--- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
+++ b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
@@ -28,13 +28,9 @@
 #include <taglib/flacpicture.h>
 #include "vorbismetadatamodel.h"
 
-VorbisMetaDataModel::VorbisMetaDataModel(const QString &path, bool readOnly)
-#ifdef HAS_PICTURE_LIST
-    : MetaDataModel(readOnly, MetaDataModel::IsCoverEditable),
-#else
-    : MetaDataModel(readOnly),
-#endif
-      m_path(path)
+VorbisMetaDataModel::VorbisMetaDataModel(const QString &path, bool readOnly) :
+    MetaDataModel(readOnly, MetaDataModel::IsCoverEditable),
+    m_path(path)
 {
     m_stream = new TagLib::FileStream(QStringToFileName(path), readOnly);
     m_file = new TagLib::Ogg::Vorbis::File(m_stream);
@@ -61,7 +57,6 @@ QPixmap VorbisMetaDataModel::cover() const
     if(!m_tag || m_tag->isEmpty())
         return QPixmap();
 
-#ifdef HAS_PICTURE_LIST
     TagLib::List<TagLib::FLAC::Picture *> list = m_tag->pictureList();
     for(uint i = 0; i < list.size(); ++i)
     {
@@ -72,26 +67,10 @@ QPixmap VorbisMetaDataModel::cover() const
             return cover;
         }
     }
-#else
-    TagLib::StringList list = m_tag->fieldListMap()["METADATA_BLOCK_PICTURE"];
-    if(list.isEmpty())
-        return QPixmap();
-    for(uint i = 0; i < list.size(); ++i)
-    {
-        TagLib::FLAC::Picture pict;
-        TagLib::String value = list[i];
-        QByteArray block = QByteArray::fromBase64(TStringToQString(value).toLatin1());
-        pict.parse(TagLib::ByteVector(block.constData(), block.size()));
-        QPixmap cover;
-        cover.loadFromData(QByteArray(pict.data().data(), pict.data().size())); //read binary picture data
-        return cover;
-    }
-#endif
 
     return QPixmap();
 }
 
-#ifdef HAS_PICTURE_LIST
 void VorbisMetaDataModel::setCover(const QPixmap &pix)
 {
     removeCover();
@@ -131,7 +110,6 @@ void VorbisMetaDataModel::removeCover()
         }
     }
 }
-#endif
 
 VorbisCommentModel::VorbisCommentModel(VorbisMetaDataModel *model) : TagModel(TagModel::Save)
 {
@@ -236,11 +214,4 @@ void VorbisCommentModel::save()
 {
     if(m_model->m_tag)
         m_model->m_file->save();
-
-#if ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 10))
-    //taglib bug workarround
-    delete m_model->m_file;
-    m_model->m_file = new TagLib::Ogg::Vorbis::File(QStringToFileName(m_model->m_path));
-    m_model->m_tag = m_model->m_file->tag();
-#endif
 }
diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.h b/src/plugins/Input/vorbis/vorbismetadatamodel.h
index de268ec42..33a6599ff 100644
--- a/src/plugins/Input/vorbis/vorbismetadatamodel.h
+++ b/src/plugins/Input/vorbis/vorbismetadatamodel.h
@@ -27,10 +27,6 @@
 #include <taglib/tfilestream.h>
 #include <taglib/tfilestream.h>
 
-#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 11))
-#define HAS_PICTURE_LIST
-#endif
-
 class VorbisCommentModel;
 
 class VorbisMetaDataModel : public MetaDataModel
@@ -42,10 +38,8 @@ public:
 
     QList<TagModel* > tags() const override;
     QPixmap cover() const override;
-#ifdef HAS_PICTURE_LIST
     void setCover(const QPixmap &pix) override;
     void removeCover() override;
-#endif
 
 private:
     QString m_path;