3 files changed, 9 insertions, 22 deletions
diff --git a/src/qmmpui/detailsdialog.cpp b/src/qmmpui/detailsdialog.cpp
index 6b5aa7032..d7fdb97e2 100644
--- a/src/qmmpui/detailsdialog.cpp
+++ b/src/qmmpui/detailsdialog.cpp
@@ -24,11 +24,8 @@
 #include <QFileInfo>
 
 #include <qmmp/metadatamanager.h>
-#include <qmmp/decoder.h>
-#include <qmmp/decoderfactory.h>
 #include <qmmp/metadatamodel.h>
 #include <qmmp/tagmodel.h>
-#include <qmmp/abstractengine.h>
 #include "abstractplaylistitem.h"
 #include "tageditor.h"
 #include "detailsdialog.h"
@@ -48,15 +45,7 @@ DetailsDialog::DetailsDialog(AbstractPlaylistItem *item, QWidget *parent)
 
     if(QFile::exists(item->url()))
     {
-        //TODO implement this inside MetaDataManager
-        DecoderFactory *fact = Decoder::findByPath(item->url());
-        EngineFactory *fact2 = AbstractEngine::findByPath(item->url());
-        if(fact)
-            m_metaDataModel = fact->createMetaDataModel(item->url(), this);
-        else if (fact2)
-            m_metaDataModel = fact2->createMetaDataModel(item->url(), this);
-        else
-            return;
+        m_metaDataModel = MetaDataManager::instance()->createMetaDataModel(item->url(), this);
 
         if(!m_metaDataModel)
             return;
diff --git a/src/qmmpui/mediaplayer.cpp b/src/qmmpui/mediaplayer.cpp
index 0170fc650..0d47dd257 100644
--- a/src/qmmpui/mediaplayer.cpp
+++ b/src/qmmpui/mediaplayer.cpp
@@ -204,7 +204,7 @@ void MediaPlayer::updateNextUrl()
     {
         m_core->play(m_model->nextItem()->url(), TRUE);
         m_nextUrl = m_model->nextItem()->url();
-        qDebug("next url");
+        qDebug("MediaPlayer: sending next url");
     }
     else
         m_nextUrl.clear();
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index cdc407174..909f0399d 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -27,14 +27,10 @@
 #include <QApplication>
 #include <QTimer>
 #include <QSettings>
-#include <QMessageBox>
 #include <QBuffer>
-
+#include <QMetaType>
 #include <time.h>
-
 #include <qmmp/metadatamanager.h>
-#include <qmmp/decoderfactory.h>
-
 #include "playlistparser.h"
 #include "playlistformat.h"
 #include "fileloader.h"
@@ -44,8 +40,6 @@
 #include "detailsdialog.h"
 #include "playlistsettings.h"
 
-#include <QMetaType>
-
 #define INVALID_ROW -1
 
 TagUpdater::TagUpdater(QObject* o,PlayListItem* item):m_observable(o),m_item(item)
@@ -997,8 +991,12 @@ void PlayListModel::clearInvalidItems()
 {
     foreach(PlayListItem *item, m_items)
     {
-        if(!item->url().contains("://") &&
-           !(QFile::exists(item->url())))// && Decoder::supports(item->url())))
+        bool ok = FALSE;
+        if(!item->url().contains("://"))
+            ok = MetaDataManager::instance()->supports(item->url());
+        else
+            ok = MetaDataManager::instance()->protocols().contains(item->url().section("://",0,0));
+        if(!ok)
             removeItem(item);
     }
 }