From 4bb84c0877c7d1d7b6661bf55edfe681ab8c22f9 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 24 Sep 2018 18:43:40 +0000 Subject: fixed build regression git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8375 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/flac/flacmetadatamodel.cpp | 6 +++--- src/plugins/Input/flac/flacmetadatamodel.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/plugins/Input/flac') diff --git a/src/plugins/Input/flac/flacmetadatamodel.cpp b/src/plugins/Input/flac/flacmetadatamodel.cpp index 54c15b006..ca06512b9 100644 --- a/src/plugins/Input/flac/flacmetadatamodel.cpp +++ b/src/plugins/Input/flac/flacmetadatamodel.cpp @@ -32,7 +32,7 @@ #include "flacmetadatamodel.h" FLACMetaDataModel::FLACMetaDataModel(const QString &path, bool readOnly) -#ifdef IS_COVER_EDITABLE +#ifdef HAS_PICTURE_LIST : MetaDataModel(true, MetaDataModel::IS_COVER_EDITABLE) #else : MetaDataModel(true) @@ -94,7 +94,7 @@ QList FLACMetaDataModel::tags() const QPixmap FLACMetaDataModel::cover() const { -#ifdef IS_COVER_EDITABLE +#ifdef HAS_PICTURE_LIST if(!m_tag || m_tag->isEmpty()) return QPixmap(); @@ -132,7 +132,7 @@ QString FLACMetaDataModel::coverPath() const return MetaDataManager::instance()->findCoverFile(m_path); } -#ifdef IS_COVER_EDITABLE +#ifdef HAS_PICTURE_LIST void FLACMetaDataModel::setCover(const QPixmap &pix) { removeCover(); diff --git a/src/plugins/Input/flac/flacmetadatamodel.h b/src/plugins/Input/flac/flacmetadatamodel.h index 09270d436..66ed03164 100644 --- a/src/plugins/Input/flac/flacmetadatamodel.h +++ b/src/plugins/Input/flac/flacmetadatamodel.h @@ -28,7 +28,7 @@ #include #if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 11)) -#define IS_COVER_EDITABLE +#define HAS_PICTURE_LIST #endif class FLACMetaDataModel : public MetaDataModel @@ -39,7 +39,7 @@ public: QList tags() const; QPixmap cover() const; QString coverPath() const; -#ifdef IS_COVER_EDITABLE +#ifdef HAS_PICTURE_LIST void setCover(const QPixmap &pix); void removeCover(); #endif -- cgit v1.2.3-13-gbd6f