changed playlist api, prepare for shortcut editor implementation, fixed direcory scan order (Closes issue 207)

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

1 files changed, 3 insertions, 6 deletions

diff --git a/src/plugins/General/hal/halplugin.cpp b/src/plugins/General/hal/halplugin.cpp
index 90106b8b0..205fd49b7 100644
--- a/src/plugins/General/hal/halplugin.cpp
+++ b/src/plugins/General/hal/halplugin.cpp
@@ -190,10 +190,7 @@ void HalPlugin::processAction(QAction *action)
 {
     qDebug("HalPlugin: action triggered: %s", qPrintable(action->data().toString()));
     QString path = action->data().toString();
-    if (path.startsWith("cdda://"))
-        MediaPlayer::instance()->playListManager()->selectedPlayList()->addFile(path);
-    else
-        MediaPlayer::instance()->playListManager()->selectedPlayList()->addDirectory(path);
+    MediaPlayer::instance()->playListManager()->selectedPlayList()->add(path);
 }
 
 QAction *HalPlugin::findAction(const QString &dev_path)
@@ -238,11 +235,11 @@ void HalPlugin::addPath(const QString &path)
 
     if (path.startsWith("cdda://") && m_addTracks)
     {
-        MediaPlayer::instance()->playListManager()->selectedPlayList()->addFile(path);
+        MediaPlayer::instance()->playListManager()->selectedPlayList()->add(path);
         return;
     }
     else if (!path.startsWith("cdda://") && m_addFiles)
-        MediaPlayer::instance()->playListManager()->selectedPlayList()->addDirectory(path);
+        MediaPlayer::instance()->playListManager()->selectedPlayList()->add(path);
 }
 
 void HalPlugin::removePath(const QString &path)