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/vorbis/vorbismetadatamodel.cpp | 8 ++++---- src/plugins/Input/vorbis/vorbismetadatamodel.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/plugins/Input/vorbis') diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp index 79334d157..e800eb045 100644 --- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp +++ b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2016 by Ilya Kotov * + * Copyright (C) 2009-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -29,7 +29,7 @@ #include "vorbismetadatamodel.h" VorbisMetaDataModel::VorbisMetaDataModel(const QString &path, bool readOnly) -#ifdef IS_COVER_EDITABLE +#ifdef HAS_PICTURE_LIST : MetaDataModel(readOnly, MetaDataModel::IS_COVER_EDITABLE) #else : MetaDataModel(readOnly) @@ -61,7 +61,7 @@ QPixmap VorbisMetaDataModel::cover() const if(!m_tag || m_tag->isEmpty()) return QPixmap(); -#ifdef IS_COVER_EDITABLE +#ifdef HAS_PICTURE_LIST TagLib::List list = m_tag->pictureList(); for(uint i = 0; i < list.size(); ++i) { @@ -91,7 +91,7 @@ QPixmap VorbisMetaDataModel::cover() const return QPixmap(); } -#ifdef IS_COVER_EDITABLE +#ifdef HAS_PICTURE_LIST void VorbisMetaDataModel::setCover(const QPixmap &pix) { removeCover(); diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.h b/src/plugins/Input/vorbis/vorbismetadatamodel.h index e2636a514..2f87e9b3e 100644 --- a/src/plugins/Input/vorbis/vorbismetadatamodel.h +++ b/src/plugins/Input/vorbis/vorbismetadatamodel.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 VorbisCommentModel; @@ -42,7 +42,7 @@ public: QList tags() const; QPixmap cover() const; -#ifdef IS_COVER_EDITABLE +#ifdef HAS_PICTURE_LIST void setCover(const QPixmap &pix); void removeCover(); #endif -- cgit v1.2.3-13-gbd6f