From 933204b47d8933c6cbd20a6faf46be9df8305f4e Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Thu, 6 Oct 2016 20:21:07 +0000 Subject: improved cover cache git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6773 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/cue/cuemetadatamodel.cpp | 9 ++------- src/plugins/Input/cue/cuemetadatamodel.h | 3 +-- src/plugins/Input/flac/flacmetadatamodel.cpp | 8 +++----- src/plugins/Input/wavpack/wavpackmetadatamodel.cpp | 8 +------- src/plugins/Input/wavpack/wavpackmetadatamodel.h | 1 - 5 files changed, 7 insertions(+), 22 deletions(-) (limited to 'src/plugins/Input') diff --git a/src/plugins/Input/cue/cuemetadatamodel.cpp b/src/plugins/Input/cue/cuemetadatamodel.cpp index 612443367..c53a42de5 100644 --- a/src/plugins/Input/cue/cuemetadatamodel.cpp +++ b/src/plugins/Input/cue/cuemetadatamodel.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009 by Ilya Kotov * + * Copyright (C) 2009-2016 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -51,12 +51,7 @@ QHash CUEMetaDataModel::audioProperties() return ap; } -QPixmap CUEMetaDataModel::cover() -{ - return MetaDataManager::instance()->getCover(m_path); -} - QString CUEMetaDataModel::coverPath() { - return MetaDataManager::instance()->getCoverPath(m_path); + return MetaDataManager::instance()->findCoverFile(m_path); } diff --git a/src/plugins/Input/cue/cuemetadatamodel.h b/src/plugins/Input/cue/cuemetadatamodel.h index e92693e30..065430f78 100644 --- a/src/plugins/Input/cue/cuemetadatamodel.h +++ b/src/plugins/Input/cue/cuemetadatamodel.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009 by Ilya Kotov * + * Copyright (C) 2009-2016 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -32,7 +32,6 @@ public: CUEMetaDataModel(const QString &url, QObject *parent); ~CUEMetaDataModel(); QHash audioProperties(); - QPixmap cover(); QString coverPath(); private: diff --git a/src/plugins/Input/flac/flacmetadatamodel.cpp b/src/plugins/Input/flac/flacmetadatamodel.cpp index b5d0cd1bb..7f8965de5 100644 --- a/src/plugins/Input/flac/flacmetadatamodel.cpp +++ b/src/plugins/Input/flac/flacmetadatamodel.cpp @@ -106,6 +106,7 @@ QList FLACMetaDataModel::tags() QPixmap FLACMetaDataModel::cover() { //embedded cover + QPixmap cover; FLAC__StreamMetadata *metadata; FLAC__metadata_get_picture (qPrintable(m_path), &metadata, @@ -114,18 +115,15 @@ QPixmap FLACMetaDataModel::cover() if(metadata) { FLAC__StreamMetadata_Picture *pict = &metadata->data.picture; - QPixmap cover; cover.loadFromData(QByteArray((char *)pict->data, (int) pict->data_length)); FLAC__metadata_object_delete(metadata); - return cover; } - QString cPath = coverPath(); - return cPath.isEmpty() ? QPixmap() : QPixmap(cPath); + return cover; } QString FLACMetaDataModel::coverPath() { - return MetaDataManager::instance()->getCoverPath(m_path); + return MetaDataManager::instance()->findCoverFile(m_path); } VorbisCommentModel::VorbisCommentModel(TagLib::Ogg::XiphComment *tag, TagLib::File *file) : TagModel(TagModel::Save) diff --git a/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp b/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp index e2d978453..61838a3f3 100644 --- a/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp +++ b/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp @@ -83,15 +83,9 @@ QList WavPackMetaDataModel::tags() return m_tags; } -QPixmap WavPackMetaDataModel::cover() -{ - QString cPath = coverPath(); - return cPath.isEmpty() ? QPixmap() : QPixmap(cPath); -} - QString WavPackMetaDataModel::coverPath() { - return MetaDataManager::instance()->getCoverPath(m_path); + return MetaDataManager::instance()->findCoverFile(m_path); } WavPackFileTagModel::WavPackFileTagModel(WavpackContext *ctx) : TagModel(TagModel::Save) diff --git a/src/plugins/Input/wavpack/wavpackmetadatamodel.h b/src/plugins/Input/wavpack/wavpackmetadatamodel.h index a9fd30dd8..823e3640e 100644 --- a/src/plugins/Input/wavpack/wavpackmetadatamodel.h +++ b/src/plugins/Input/wavpack/wavpackmetadatamodel.h @@ -34,7 +34,6 @@ public: ~WavPackMetaDataModel(); QHash audioProperties(); QList tags(); - QPixmap cover(); QString coverPath(); private: -- cgit v1.2.3-13-gbd6f