2 files changed, 3 insertions, 38 deletions
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;