diff options
Diffstat (limited to 'src/plugins/Input')
| -rw-r--r-- | src/plugins/Input/archive/decoder_archive.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/Input/archive/decoderarchivefactory.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/Input/cdaudio/settingsdialog.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Input/wildmidi/wildmidihelper.cpp | 13 |
4 files changed, 15 insertions, 16 deletions
diff --git a/src/plugins/Input/archive/decoder_archive.cpp b/src/plugins/Input/archive/decoder_archive.cpp index 118cb49aa..1c0dff1f4 100644 --- a/src/plugins/Input/archive/decoder_archive.cpp +++ b/src/plugins/Input/archive/decoder_archive.cpp @@ -59,11 +59,11 @@ bool DecoderArchive::initialize() } //is this file supported by qmmp? - QList<DecoderFactory *> filtered = Decoder::findByFileExtension(filePath); - for(DecoderFactory *f : qAsConst(filtered)) + QList<DecoderFactory *> filtered; + for(DecoderFactory *f : Decoder::findByFileExtension(filePath)) { - if(f->properties().noInput) - filtered.removeAll(f); //remove all factories without streaming input + if(!f->properties().noInput) + filtered << f; //add all factories with streaming input } if(filtered.isEmpty()) diff --git a/src/plugins/Input/archive/decoderarchivefactory.cpp b/src/plugins/Input/archive/decoderarchivefactory.cpp index 4d569defd..e96bbf007 100644 --- a/src/plugins/Input/archive/decoderarchivefactory.cpp +++ b/src/plugins/Input/archive/decoderarchivefactory.cpp @@ -95,11 +95,11 @@ QList<TrackInfo *> DecoderArchiveFactory::createPlayList(const QString &path, Tr } //is this file supported by qmmp? - QList<DecoderFactory *> filtered = Decoder::findByFileExtension(filePath); - for(DecoderFactory *f : qAsConst(filtered)) + QList<DecoderFactory *> filtered; + for(DecoderFactory *f : Decoder::findByFileExtension(filePath)) { - if(f->properties().noInput) - filtered.removeAll(f); //remove all factories without streaming input + if(!f->properties().noInput) + filtered << f; //add all factories with streaming input } if(!filtered.isEmpty()) diff --git a/src/plugins/Input/cdaudio/settingsdialog.cpp b/src/plugins/Input/cdaudio/settingsdialog.cpp index 5d31c4a25..0e428039e 100644 --- a/src/plugins/Input/cdaudio/settingsdialog.cpp +++ b/src/plugins/Input/cdaudio/settingsdialog.cpp @@ -77,7 +77,7 @@ void SettingsDialog::on_clearCacheButton_clicked() { QDir dir(Qmmp::configDir()); dir.cd("cddbcache"); - QStringList list = dir.entryList(QStringList() << "*", QDir::Files); + const QStringList list = dir.entryList(QStringList() << "*", QDir::Files); for(const QString &name : qAsConst(list)) dir.remove(name); } diff --git a/src/plugins/Input/wildmidi/wildmidihelper.cpp b/src/plugins/Input/wildmidi/wildmidihelper.cpp index e48ff7de9..186389b7d 100644 --- a/src/plugins/Input/wildmidi/wildmidihelper.cpp +++ b/src/plugins/Input/wildmidi/wildmidihelper.cpp @@ -113,15 +113,14 @@ void WildMidiHelper::removePtr(void *t) QStringList WildMidiHelper::configFiles() const { - QStringList files = QStringList() << "/etc/timidity.cfg" - << "/etc/timidity/timidity.cfg" - << "/etc/wildmidi/wildmidi.cfg"; - for(const QString &path : qAsConst(files)) + const QStringList paths = { "/etc/timidity.cfg", "/etc/timidity/timidity.cfg", "/etc/wildmidi/wildmidi.cfg" }; + QStringList filtered; + for(const QString &path : qAsConst(paths)) { - if(!QFile::exists(path)) - files.removeAll(path); + if(QFile::exists(path)) + filtered << path; } - return files; + return filtered; } quint32 WildMidiHelper::sampleRate() |
