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

2 files changed, 28 insertions, 12 deletions

diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
index 8c9305beb..79334d157 100644
--- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
+++ b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp
@@ -29,7 +29,11 @@
 #include "vorbismetadatamodel.h"
 
 VorbisMetaDataModel::VorbisMetaDataModel(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);
@@ -57,6 +61,7 @@ QPixmap VorbisMetaDataModel::cover() const
     if(!m_tag || m_tag->isEmpty())
         return QPixmap();
 
+#ifdef IS_COVER_EDITABLE
     TagLib::List<TagLib::FLAC::Picture *> list = m_tag->pictureList();
     for(uint i = 0; i < list.size(); ++i)
     {
@@ -67,10 +72,26 @@ 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 IS_COVER_EDITABLE
 void VorbisMetaDataModel::setCover(const QPixmap &pix)
 {
     removeCover();
@@ -87,12 +108,6 @@ void VorbisMetaDataModel::setCover(const QPixmap &pix)
         picture->setData(TagLib::ByteVector(data.constData(), data.size()));
         m_tag->addPicture(picture);
         m_file->save();
-#if ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 10))
-        //taglib bug workarround
-        delete m_file;
-        m_file = new TagLib::Ogg::Vorbis::File(QStringToFileName(m_path));
-        m_tag = m_file->tag();
-#endif
     }
 }
 
@@ -113,15 +128,10 @@ void VorbisMetaDataModel::removeCover()
         if(save)
         {
             m_file->save();
-#if ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 10))
-            //taglib bug workarround
-            delete m_file;
-            m_file = new TagLib::Ogg::Vorbis::File(QStringToFileName(m_path));
-            m_tag = m_file->tag();
-#endif
         }
     }
 }
+#endif
 
 VorbisCommentModel::VorbisCommentModel(VorbisMetaDataModel *model) : TagModel(TagModel::Save)
 {
diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.h b/src/plugins/Input/vorbis/vorbismetadatamodel.h
index a2a6a3a59..e2636a514 100644
--- a/src/plugins/Input/vorbis/vorbismetadatamodel.h
+++ b/src/plugins/Input/vorbis/vorbismetadatamodel.h
@@ -27,6 +27,10 @@
 #include <taglib/tfilestream.h>
 #include <taglib/tfilestream.h>
 
+#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 11))
+#define IS_COVER_EDITABLE
+#endif
+
 class VorbisCommentModel;
 
 class VorbisMetaDataModel : public MetaDataModel
@@ -38,8 +42,10 @@ public:
 
     QList<TagModel* > tags() const;
     QPixmap cover() const;
+#ifdef IS_COVER_EDITABLE
     void setCover(const QPixmap &pix);
     void removeCover();
+#endif
 
 private:
     QString m_path;