added playlist groups, disabled broken plugins

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

3 files changed, 11 insertions, 11 deletions

diff --git a/src/plugins/General/mpris/mpris1/tracklistobject.cpp b/src/plugins/General/mpris/mpris1/tracklistobject.cpp
index 9576a902a..e75900439 100644
--- a/src/plugins/General/mpris/mpris1/tracklistobject.cpp
+++ b/src/plugins/General/mpris/mpris1/tracklistobject.cpp
@@ -82,7 +82,7 @@ int TrackListObject::GetLength()
 QVariantMap TrackListObject::GetMetadata(int in0)
 {
     QVariantMap map;
-    PlayListItem *item = m_model->item(in0);
+    PlayListTrack *item = m_model->item(in0);
     if (item)
     {
         if (QFile::exists(item->url()))
diff --git a/src/plugins/General/mpris/mpris2/player2object.cpp b/src/plugins/General/mpris/mpris2/player2object.cpp
index 1aeb4b2ac..af22d1eb7 100644
--- a/src/plugins/General/mpris/mpris2/player2object.cpp
+++ b/src/plugins/General/mpris/mpris2/player2object.cpp
@@ -119,7 +119,7 @@ double Player2Object::maximumRate() const
 
 QVariantMap Player2Object::metadata() const
 {
-    PlayListItem *item = m_pl_manager->currentPlayList()->currentItem();
+    PlayListTrack *item = m_pl_manager->currentPlayList()->currentItem();
     if(!item || m_core->metaData(Qmmp::URL).isEmpty())
         return QVariantMap();
     QVariantMap map;
@@ -222,8 +222,8 @@ void Player2Object::OpenUri(const QString &in0)
     if(!m_pl_manager->currentPlayList()->isLoaderRunning())
     {
         m_pl_manager->selectPlayList(m_pl_manager->currentPlayList());
-        connect(m_pl_manager->currentPlayList(), SIGNAL(itemAdded(PlayListItem*)),
-                SLOT(playItem(PlayListItem*)));
+        connect(m_pl_manager->currentPlayList(), SIGNAL(itemAdded(PlayListTrack*)),
+                SLOT(playItem(PlayListTrack*)));
         connect(m_pl_manager->currentPlayList(), SIGNAL(loaderFinished()), this, SLOT(disconnectPl()));
     }
     m_pl_manager->currentPlayList()->add(path);
@@ -343,11 +343,11 @@ void Player2Object::checkSeeking(qint64 elapsed)
     m_previous_pos = elapsed;
 }
 
-void Player2Object::playItem(PlayListItem *item)
+void Player2Object::playItem(PlayListTrack *item)
 {
     m_pl_manager->selectPlayList((PlayListModel*)sender());
     m_pl_manager->activatePlayList((PlayListModel*)sender());
-    disconnect(sender(), SIGNAL(itemAddded(itemAdded(PlayListItem*))), this, SLOT(playItem(PlayListItem*)));
+    disconnect(sender(), SIGNAL(itemAddded(itemAdded(PlayListTrack*))), this, SLOT(playItem(PlayListTrack*)));
     if(!m_pl_manager->currentPlayList()->setCurrent(item))
         return;
     m_core->stop();
@@ -356,8 +356,8 @@ void Player2Object::playItem(PlayListItem *item)
 
 void Player2Object::disconnectPl()
 {
-    disconnect(sender(), SIGNAL(itemAddded(itemAdded(PlayListItem*))),
-               this, SLOT(playItem(PlayListItem*)));
+    disconnect(sender(), SIGNAL(itemAddded(itemAdded(PlayListTrack*))),
+               this, SLOT(playItem(PlayListTrack*)));
 }
 
 void Player2Object::setModel(PlayListModel *selected, PlayListModel *previous)
diff --git a/src/plugins/General/mpris/mpris2/player2object.h b/src/plugins/General/mpris/mpris2/player2object.h
index 37d332cf2..b808f83e5 100644
--- a/src/plugins/General/mpris/mpris2/player2object.h
+++ b/src/plugins/General/mpris/mpris2/player2object.h
@@ -30,7 +30,7 @@
 class SoundCore;
 class MediaPlayer;
 class PlayListManager;
-class PlayListItem;
+class PlayListTrack;
 class PlayListModel;
 
 /**
@@ -97,7 +97,7 @@ private slots:
     void updateId();
     void checkState(Qmmp::State state);
     void checkSeeking(qint64 elapsed);
-    void playItem(PlayListItem *item);
+    void playItem(PlayListTrack *item);
     void disconnectPl();
     void setModel(PlayListModel *selected, PlayListModel *previous);
 
@@ -109,7 +109,7 @@ private:
     PlayListManager *m_pl_manager;
     QMap<QString, QVariant> m_props;
     QDBusObjectPath m_trackID;
-    PlayListItem *m_prev_item;
+    PlayListTrack *m_prev_item;
     qint64 m_previous_pos;
 
 };