refactoring

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

3 files changed, 28 insertions, 15 deletions

diff --git a/src/qmmpui/fileloader.cpp b/src/qmmpui/fileloader.cpp
index 6fc32cc3e..8205a129a 100644
--- a/src/qmmpui/fileloader.cpp
+++ b/src/qmmpui/fileloader.cpp
@@ -38,7 +38,7 @@ void FileLoader::addFile(const QString &path)
     bool use_meta = m_settings->useMetadata();
     QList <FileInfo *> playList = MetaDataManager::instance()->createPlayList(path, use_meta);
     foreach(FileInfo *info, playList)
-        emit newPlayListTrack(new PlayListTrack(info));
+        emit newTrackToAdd(new PlayListTrack(info));
     qDeleteAll(playList);
 }
 
@@ -89,12 +89,12 @@ void FileLoader::run()
     }
 }
 
-void FileLoader::load(const QString &path)
+void FileLoader::add(const QString &path)
 {
-    load(QStringList() << path);
+    add(QStringList() << path);
 }
 
-void FileLoader::load(const QStringList &paths)
+void FileLoader::add(const QStringList &paths)
 {
     m_paths << paths;
     MetaDataManager::instance()->prepareForAnotherThread();
@@ -102,6 +102,15 @@ void FileLoader::load(const QStringList &paths)
     start(QThread::IdlePriority);
 }
 
+void FileLoader::insert(int index, const QString &path)
+{
+    insert(index, QStringList() << path);
+}
+
+void FileLoader::insert(int index, const QStringList &paths)
+{
+}
+
 void FileLoader::finish()
 {
     m_finished = true;
diff --git a/src/qmmpui/fileloader_p.h b/src/qmmpui/fileloader_p.h
index 9bb30a307..21e59eb93 100644
--- a/src/qmmpui/fileloader_p.h
+++ b/src/qmmpui/fileloader_p.h
@@ -58,25 +58,27 @@ public:
     /*!
      * Sets file/directory to load
      */
-    void load(const QString &path);
+    void add(const QString &path);
     /*!
      * Sets files/directories to load
      */
-    void load(const QStringList &paths);
+    void add(const QStringList &paths);
+
+    void insert(int index, const QString &path);
+    void insert(int index, const QStringList &paths);
 
 signals:
     /*!
-     * Emitted when new playlist item is available.
-     * @param item Pointer of the new PlayListItem object.
+     * Emitted when new playlist track is available.
+     * @param item Pointer of the new PlayListTrack object.
      */
-    void newPlayListTrack(PlayListTrack *item);
+    void newTrackToAdd(PlayListTrack *track);
+    void newTrackToInsert(PlayListTrack *track);
 
-protected:
+private:
     virtual void run();
     void addFile(const QString &path);
     void addDirectory(const QString &s);
-
-private:
     bool checkRestrictFilters(const QFileInfo &info);
     bool checkExcludeFilters(const QFileInfo &info);
     QQueue <QString> m_paths;
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index 50c364aa9..bcf1ed3cb 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -130,13 +130,13 @@ void PlayListModel::add(QList<PlayListTrack *> tracks)
 
 void PlayListModel::add(const QString &path)
 {
-    m_loader->load(path);
+    m_loader->add(path);
     loadPlaylist(path);
 }
 
 void PlayListModel::add(const QStringList &paths)
 {
-    m_loader->load(paths);
+    m_loader->add(paths);
     foreach(QString str, paths)
     {
         loadPlaylist(str);
@@ -193,6 +193,7 @@ void PlayListModel::insert(int index, QList<PlayListTrack *> tracks)
 
 void PlayListModel::insert(int index, const QString &path)
 {
+    m_loader->insert(index, path);
     /*QFileInfo f_info(path);
     if (f_info.isDir())
         m_loader->loadDirectory(path);
@@ -205,6 +206,7 @@ void PlayListModel::insert(int index, const QString &path)
 
 void PlayListModel::insert(int index, const QStringList &paths)
 {
+    m_loader->insert(index, paths);
     /*foreach(QString str, paths)
     {
         add(str);
@@ -814,7 +816,7 @@ void PlayListModel::loadPlaylist(const QString &f_name)
         if (QFileInfo(list.at(i)).isRelative())
             list[i].prepend(QFileInfo(f_name).canonicalPath () + QDir::separator ());
     }
-    m_loader->load(list);
+    m_loader->add(list);
     file.close();
 }