From 997de852100372a2d1b1f1fb9219f5a70a8d98c0 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Mon, 24 Sep 2018 18:19:12 +0000
Subject: fixed taglib 1.10 support

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8374 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Input/opus/opusmetadatamodel.cpp | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'src/plugins/Input/opus/opusmetadatamodel.cpp')

diff --git a/src/plugins/Input/opus/opusmetadatamodel.cpp b/src/plugins/Input/opus/opusmetadatamodel.cpp
index cc6bd4dfd..56edfb9da 100644
--- a/src/plugins/Input/opus/opusmetadatamodel.cpp
+++ b/src/plugins/Input/opus/opusmetadatamodel.cpp
@@ -29,7 +29,11 @@
 #include "opusmetadatamodel.h"
 
 OpusMetaDataModel::OpusMetaDataModel(const QString &path, bool readOnly)
+#ifdef IS_COVER_EDITABLE
     : MetaDataModel(readOnly, MetaDataModel::IS_COVER_EDITABLE)
+#else
+    : MetaDataModel(readOnly)
+#endif
 {
     m_path = path;
     m_stream = new TagLib::FileStream(QStringToFileName(path), readOnly);
@@ -71,6 +75,7 @@ QPixmap OpusMetaDataModel::cover() const
     if(!tag || tag->isEmpty())
         return QPixmap();
 
+#ifdef IS_COVER_EDITABLE
     TagLib::List<TagLib::FLAC::Picture *> list = tag->pictureList();
     for(uint i = 0; i < list.size(); ++i)
     {
@@ -81,9 +86,25 @@ 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 IS_COVER_EDITABLE
 void OpusMetaDataModel::setCover(const QPixmap &pix)
 {
     removeCover();
@@ -125,6 +146,7 @@ void OpusMetaDataModel::removeCover()
         }
     }
 }
+#endif
 
 VorbisCommentModel::VorbisCommentModel(TagLib::Ogg::Opus::File *file) : TagModel(TagModel::Save)
 {
-- 
cgit v1.2.3-13-gbd6f