diff options
Diffstat (limited to 'src/plugins/Input/opus/opusmetadatamodel.cpp')
| -rw-r--r-- | src/plugins/Input/opus/opusmetadatamodel.cpp | 29 |
1 files changed, 4 insertions, 25 deletions
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) { |
