aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input/vorbis
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2018-09-24 18:43:40 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2018-09-24 18:43:40 +0000
commit4bb84c0877c7d1d7b6661bf55edfe681ab8c22f9 (patch)
treeaf76cf0091bcd43e7a8a6e441a555f5f6bcc7a24 /src/plugins/Input/vorbis
parent997de852100372a2d1b1f1fb9219f5a70a8d98c0 (diff)
downloadqmmp-4bb84c0877c7d1d7b6661bf55edfe681ab8c22f9.tar.gz
qmmp-4bb84c0877c7d1d7b6661bf55edfe681ab8c22f9.tar.bz2
qmmp-4bb84c0877c7d1d7b6661bf55edfe681ab8c22f9.zip
fixed build regression
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8375 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/vorbis')
-rw-r--r--src/plugins/Input/vorbis/vorbismetadatamodel.cpp8
-rw-r--r--src/plugins/Input/vorbis/vorbismetadatamodel.h4
2 files changed, 6 insertions, 6 deletions
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<TagLib::FLAC::Picture *> 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 <taglib/tfilestream.h>
#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<TagModel* > tags() const;
QPixmap cover() const;
-#ifdef IS_COVER_EDITABLE
+#ifdef HAS_PICTURE_LIST
void setCover(const QPixmap &pix);
void removeCover();
#endif