Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2024-12-14 18:35:16 +01:00
Code Issues Releases Wiki Activity

Ignore playlists when loading local directories. Fixes issue #886

Browse Source
This commit is contained in:
David Sansome 2010-10-16 12:37:33 +00:00
parent 298137b85e
commit 14fb4ca202
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/songloader.cpp
View File

@ -90,7 +90,8 @@ SongLoader::Result SongLoader::Load(const QUrl& url) {
#endif #endif
} }
SongLoader::Result SongLoader::LoadLocal(const QString& filename, bool block) { SongLoader::Result SongLoader::LoadLocal(const QString& filename, bool block,
bool ignore_playlists) {
qDebug() << "Loading local file" << filename; qDebug() << "Loading local file" << filename;
// First check to see if it's a directory - if so we can load all the songs // First check to see if it's a directory - if so we can load all the songs
@ -120,6 +121,11 @@ SongLoader::Result SongLoader::LoadLocal(const QString& filename, bool block) {
} }
if (parser) { if (parser) {
if (ignore_playlists) {
qDebug() << "Skipping" << parser->name() << "playlist while loading directory";
return Success;
}
qDebug() << "Parsing using" << parser->name(); qDebug() << "Parsing using" << parser->name();
// It's a playlist! // It's a playlist!
@ -182,7 +188,7 @@ void SongLoader::LoadLocalDirectory(const QString& filename) {
while (it.hasNext()) { while (it.hasNext()) {
// This is in another thread so we can do blocking calls. // This is in another thread so we can do blocking calls.
LoadLocal(it.next(), true); LoadLocal(it.next(), true, true);
} }
qStableSort(songs_.begin(), songs_.end(), CompareSongs); qStableSort(songs_.begin(), songs_.end(), CompareSongs);

2
src/core/songloader.h
View File

@ -70,7 +70,7 @@ private:
Finished, Finished,
}; };
Result LoadLocal(const QString& filename, bool block = false); Result LoadLocal(const QString& filename, bool block = false, bool ignore_playlists = false);
void LoadLocalDirectory(const QString& filename); void LoadLocalDirectory(const QString& filename);
void LoadPlaylist(ParserBase* parser, const QString& filename); void LoadPlaylist(ParserBase* parser, const QString& filename);
void LoadLocalDirectoryAndEmit(const QString& filename); void LoadLocalDirectoryAndEmit(const QString& filename);