diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2020-09-29 18:57:32 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2020-09-29 18:57:32 +0000 |
| commit | 9e562efd8805f9b35dc5d041c677a5e985ea2031 (patch) | |
| tree | 81b36b0f710a2fa9ff29462489f9c40b783b6df8 /src | |
| parent | 76fdb39267071f7653f6ed9c5fbc119219ec43a3 (diff) | |
| download | qmmp-9e562efd8805f9b35dc5d041c677a5e985ea2031.tar.gz qmmp-9e562efd8805f9b35dc5d041c677a5e985ea2031.tar.bz2 qmmp-9e562efd8805f9b35dc5d041c677a5e985ea2031.zip | |
added webp cover image support
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9505 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src')
| -rw-r--r-- | src/qmmp/metadatamanager.cpp | 5 | ||||
| -rw-r--r-- | src/qmmp/qmmpsettings.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/qmmp/metadatamanager.cpp b/src/qmmp/metadatamanager.cpp index 26383672a..e39abb16f 100644 --- a/src/qmmp/metadatamanager.cpp +++ b/src/qmmp/metadatamanager.cpp @@ -23,6 +23,7 @@ #include <QBuffer> #include <QMutexLocker> #include <QCoreApplication> +#include <QImageReader> #include "decoder.h" #include "decoderfactory.h" #include "abstractengine.h" @@ -250,6 +251,7 @@ QFileInfoList MetaDataManager::findCoverFiles(QDir dir, int depth) const dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks); dir.setSorting(QDir::Name); QFileInfoList file_list = dir.entryInfoList(m_settings->coverNameFilters()); + const auto fileListCopy = file_list; //avoid container modification for(const QFileInfo &i : qAsConst(fileListCopy)) { @@ -261,6 +263,9 @@ QFileInfoList MetaDataManager::findCoverFiles(QDir dir, int depth) const break; } } + + if(QImageReader::imageFormat(i.fileName()).isEmpty()) //remove unsupported image formats + file_list.removeAll(i.fileName()); } if(!depth || !file_list.isEmpty()) return file_list; diff --git a/src/qmmp/qmmpsettings.cpp b/src/qmmp/qmmpsettings.cpp index 612e94fe6..6ceaa0acb 100644 --- a/src/qmmp/qmmpsettings.cpp +++ b/src/qmmp/qmmpsettings.cpp @@ -48,7 +48,7 @@ QmmpSettings::QmmpSettings(QObject *parent) : QObject(parent) m_average_bitrate = settings.value("Output/average_bitrate", false).toBool(); //cover settings settings.beginGroup("Cover"); - m_cover_inc = settings.value("include", (QStringList() << "*.jpg" << "*.png")).toStringList(); + m_cover_inc = settings.value("include", (QStringList() << "*.jpg" << "*.png" << "*.webp")).toStringList(); m_cover_exclude = settings.value("exclude", (QStringList() << "*back*")).toStringList(); m_cover_depth = settings.value("depth", 0).toInt(); m_cover_use_files = settings.value("use_files", true).toBool(); |