aboutsummaryrefslogtreecommitdiff
path: root/src/qmmpui/fileloader.cpp
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2018-06-11 12:41:42 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2018-06-11 12:41:42 +0000
commitdf8a183c76095973e2b3b410128d075cf1f56c38 (patch)
tree88bf90a563e4f370f1f848a1f3509c21046408ac /src/qmmpui/fileloader.cpp
parent943cc5a2abf6b61552ab08bc2d61f7b32c99f831 (diff)
downloadqmmp-df8a183c76095973e2b3b410128d075cf1f56c38.tar.gz
qmmp-df8a183c76095973e2b3b410128d075cf1f56c38.tar.bz2
qmmp-df8a183c76095973e2b3b410128d075cf1f56c38.zip
fixed regression
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8023 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/qmmpui/fileloader.cpp')
-rw-r--r--src/qmmpui/fileloader.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/qmmpui/fileloader.cpp b/src/qmmpui/fileloader.cpp
index e7eab5a0b..e11f14fdf 100644
--- a/src/qmmpui/fileloader.cpp
+++ b/src/qmmpui/fileloader.cpp
@@ -61,8 +61,7 @@ void FileLoader::insertPlayList(const QString &fmt, const QByteArray &contents,
while (!tracks.isEmpty() && !m_finished)
{
PlayListTrack *t = tracks.takeFirst();
- QList <TrackInfo *> infoList = MetaDataManager::instance()->createPlayList(t->path(),
- m_parts ? TrackInfo::MetaData : TrackInfo::NoParts);
+ QList<TrackInfo *> infoList = MetaDataManager::instance()->createPlayList(t->path(), m_parts);
if(infoList.count() != 1) //invalid or unsupported track
{
qDeleteAll(infoList);
@@ -90,7 +89,7 @@ void FileLoader::insertPlayList(const QString &path, PlayListItem *before)
while (!tracks.isEmpty() && !m_finished)
{
PlayListTrack *t = tracks.takeFirst();
- QList <TrackInfo *> infoList = MetaDataManager::instance()->createPlayList(t->path(), m_parts ? TrackInfo::MetaData : TrackInfo::NoParts);
+ QList <TrackInfo *> infoList = MetaDataManager::instance()->createPlayList(t->path(), m_parts);
if(infoList.count() != 1) //invalid or unsupported track
{
qDeleteAll(infoList);
@@ -99,11 +98,11 @@ void FileLoader::insertPlayList(const QString &path, PlayListItem *before)
continue;
}
- TrackInfo *info = infoList.first();
+ TrackInfo *info = infoList.takeFirst();
if(!info->value(Qmmp::ALBUM).isEmpty() && !info->value(Qmmp::ARTIST).isEmpty())
- t->updateMetaData(infoList.first());
+ t->updateMetaData(info);
- emit newTracksToInsert(before, QList<PlayListTrack *>() << t);
+ emit newTracksToInsert(before, QList<PlayListTrack *>() << t); //TODO optimization
delete info;
}
//clear remaining tracks