From a7dfabe423c9fcfc2da38ec4ad78fe2f178fc027 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 23 Sep 2018 19:27:25 +0000 Subject: feature to set cover for ogg opus and ogg vorbis git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8357 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/vorbis/vorbismetadatamodel.cpp | 92 +++++++++++++++--------- src/plugins/Input/vorbis/vorbismetadatamodel.h | 4 +- 2 files changed, 62 insertions(+), 34 deletions(-) (limited to 'src/plugins/Input/vorbis') diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp index f56869f30..8c9305beb 100644 --- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp +++ b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp @@ -19,15 +19,17 @@ ***************************************************************************/ #include +#include #include #include #include #include #include +#include #include "vorbismetadatamodel.h" VorbisMetaDataModel::VorbisMetaDataModel(const QString &path, bool readOnly) - : MetaDataModel(readOnly) + : MetaDataModel(readOnly, MetaDataModel::IS_COVER_EDITABLE) { m_path = path; m_stream = new TagLib::FileStream(QStringToFileName(path), readOnly); @@ -54,45 +56,71 @@ QPixmap VorbisMetaDataModel::cover() const { if(!m_tag || m_tag->isEmpty()) return QPixmap(); - TagLib::StringList list = m_tag->fieldListMap()["METADATA_BLOCK_PICTURE"]; - if(list.isEmpty()) - return QPixmap(); + + TagLib::List list = m_tag->pictureList(); for(uint i = 0; i < list.size(); ++i) { - TagLib::String value = list[i]; - QByteArray block = QByteArray::fromBase64(TStringToQString(value).toLatin1()); - if(block.size() < 32) - continue; - qint64 pos = 0; - if(readPictureBlockField(block, pos) != 3) //picture type, use front cover only - continue; - pos += 4; - int mimeLength = readPictureBlockField(block, pos); //mime type length - pos += 4; - pos += mimeLength; //skip mime type - int descLength = readPictureBlockField(block, pos); //description length - pos += 4; - pos += descLength; //skip description - pos += 4; //width - pos += 4; //height - pos += 4; //color depth - pos += 4; //the number of colors used - int length = readPictureBlockField(block, pos); //picture size - pos += 4; - QPixmap cover; - cover.loadFromData(block.mid(pos, length)); //read binary picture data - return cover; + if(list[i]->type() == TagLib::FLAC::Picture::FrontCover) + { + QPixmap cover; + cover.loadFromData(QByteArray(list[i]->data().data(), list[i]->data().size())); //read binary picture data + return cover; + } } + return QPixmap(); } -ulong VorbisMetaDataModel::readPictureBlockField(QByteArray data, int offset) const +void VorbisMetaDataModel::setCover(const QPixmap &pix) { - return (((uchar)data.data()[offset] & 0xff) << 24) | - (((uchar)data.data()[offset+1] & 0xff) << 16) | - (((uchar)data.data()[offset+2] & 0xff) << 16) | - ((uchar)data.data()[offset+3] & 0xff); + removeCover(); + if(m_tag) + { + TagLib::FLAC::Picture *picture = new TagLib::FLAC::Picture(); + picture->setType(TagLib::FLAC::Picture::FrontCover); + + QByteArray data; + QBuffer buffer(&data); + buffer.open(QIODevice::WriteOnly); + pix.save(&buffer, "JPEG"); + picture->setMimeType("image/jpeg"); + 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 + } +} +void VorbisMetaDataModel::removeCover() +{ + if(m_tag && !m_tag->isEmpty()) + { + bool save = false; + TagLib::List list = m_tag->pictureList(); + for(uint i = 0; i < list.size(); ++i) + { + if(list[i]->type() == TagLib::FLAC::Picture::FrontCover) + { + m_tag->removePicture(list[i], false); + save = true; + } + } + 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 + } + } } VorbisCommentModel::VorbisCommentModel(VorbisMetaDataModel *model) : TagModel(TagModel::Save) diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.h b/src/plugins/Input/vorbis/vorbismetadatamodel.h index fe8d3ea30..a2a6a3a59 100644 --- a/src/plugins/Input/vorbis/vorbismetadatamodel.h +++ b/src/plugins/Input/vorbis/vorbismetadatamodel.h @@ -38,10 +38,10 @@ public: QList tags() const; QPixmap cover() const; + void setCover(const QPixmap &pix); + void removeCover(); private: - ulong readPictureBlockField(QByteArray data, int offset) const; - QString m_path; TagLib::Ogg::Vorbis::File *m_file; TagLib::Ogg::XiphComment *m_tag; -- cgit v1.2.3-13-gbd6f