fixed feature to disable metadata

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8005 90c681e8-e032-0410-971d-27865f9a5e38

2 files changed, 10 insertions, 9 deletions

diff --git a/src/qmmpui/fileloader.cpp b/src/qmmpui/fileloader.cpp
index b02f73bf6..e7eab5a0b 100644
--- a/src/qmmpui/fileloader.cpp
+++ b/src/qmmpui/fileloader.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2017 by Ilya Kotov                                 *
+ *   Copyright (C) 2006-2018 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -34,7 +34,7 @@ FileLoader::FileLoader(QObject *parent) : QThread(parent)
     qRegisterMetaType<QList<PlayListTrack*> >("QList<PlayListTrack*>");
     m_settings = QmmpUiSettings::instance();
     m_finished = false;
-    m_use_meta = false;
+    m_parts = TrackInfo::NoParts;
     connect(qApp, SIGNAL(aboutToQuit()), SLOT(finish()));
 }
 
@@ -44,7 +44,7 @@ FileLoader::~FileLoader()
 QList<PlayListTrack *> FileLoader::processFile(const QString &path, QStringList *ignoredPaths)
 {
     QList<PlayListTrack *> tracks;
-    QList <TrackInfo *> infoList = MetaDataManager::instance()->createPlayList(path, TrackInfo::MetaData, ignoredPaths);
+    QList <TrackInfo *> infoList = MetaDataManager::instance()->createPlayList(path, m_parts, ignoredPaths);
 
     foreach (TrackInfo *info, infoList)
     {
@@ -62,7 +62,7 @@ void FileLoader::insertPlayList(const QString &fmt, const QByteArray &contents,
     {
         PlayListTrack *t = tracks.takeFirst();
         QList <TrackInfo *> infoList = MetaDataManager::instance()->createPlayList(t->path(),
-                                                                                   m_use_meta ? TrackInfo::MetaData : TrackInfo::NoParts);
+                                                                                   m_parts ? TrackInfo::MetaData : TrackInfo::NoParts);
         if(infoList.count() != 1) //invalid or unsupported track
         {
             qDeleteAll(infoList);
@@ -90,7 +90,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_use_meta ? TrackInfo::MetaData : TrackInfo::NoParts);
+        QList <TrackInfo *> infoList = MetaDataManager::instance()->createPlayList(t->path(), m_parts ? TrackInfo::MetaData : TrackInfo::NoParts);
         if(infoList.count() != 1) //invalid or unsupported track
         {
             qDeleteAll(infoList);
@@ -246,7 +246,7 @@ void FileLoader::addPlayList(const QString &fmt, const QByteArray &data)
         MetaDataManager::instance()->prepareForAnotherThread();
         PlayListParser::loadFormats();
         m_filters = MetaDataManager::instance()->nameFilters();
-        m_use_meta = m_settings->useMetadata();
+        m_parts = m_settings->useMetadata() ? TrackInfo::AllParts : TrackInfo::NoParts;
     }
     start(QThread::IdlePriority);
 }
@@ -272,7 +272,7 @@ void FileLoader::insert(PlayListItem *before, const QStringList &paths)
     {
         MetaDataManager::instance()->prepareForAnotherThread();
         m_filters = MetaDataManager::instance()->nameFilters();
-        m_use_meta = m_settings->useMetadata();
+        m_parts = m_settings->useMetadata() ? TrackInfo::AllParts : TrackInfo::NoParts;
     }
     start(QThread::IdlePriority);
 }
diff --git a/src/qmmpui/fileloader_p.h b/src/qmmpui/fileloader_p.h
index 4bab33b3f..d479ef786 100644
--- a/src/qmmpui/fileloader_p.h
+++ b/src/qmmpui/fileloader_p.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2017 by Ilya Kotov                                 *
+ *   Copyright (C) 2006-2018 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -26,6 +26,7 @@
 #include <QFileInfo>
 #include <QMutex>
 #include <QThread>
+#include <qmmp/trackinfo.h>
 
 class PlayListTrack;
 class PlayListItem;
@@ -100,7 +101,7 @@ private:
     QStringList m_filters;
     QmmpUiSettings *m_settings;
     bool m_finished;
-    bool m_use_meta;
+    TrackInfo::Parts m_parts;
     QMutex m_mutex;
 
 };