diff options
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(); |