From 245d0ac0cdb729c94ca71dc035342154d70aa8e5 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Mon, 5 Aug 2013 11:50:37 +0000
Subject: 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
---
 src/qmmpui/mediaplayer.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/qmmpui/mediaplayer.cpp')

diff --git a/src/qmmpui/mediaplayer.cpp b/src/qmmpui/mediaplayer.cpp
index c251bec0e..fbe61d74e 100644
--- a/src/qmmpui/mediaplayer.cpp
+++ b/src/qmmpui/mediaplayer.cpp
@@ -89,7 +89,7 @@ void MediaPlayer::play(qint64 offset)
     if (m_pl_manager->currentPlayList()->count() == 0)
         return;
 
-    QString s = m_pl_manager->currentPlayList()->currentItem()->url();
+    QString s = m_pl_manager->currentPlayList()->currentTrack()->url();
     if (s.isEmpty())
     {
         m_nextUrl.clear();
@@ -172,18 +172,18 @@ void MediaPlayer::setNoPlaylistAdvance(bool enabled)
 void MediaPlayer::updateNextUrl()
 {
     m_nextUrl.clear();
-    PlayListItem *item = 0;
+    PlayListTrack *track = 0;
     if(isRepeatable())
-        item = m_pl_manager->currentPlayList()->currentItem();
+        track = m_pl_manager->currentPlayList()->currentTrack();
     else if(!m_noPlaylistAdvance)
-        item = m_pl_manager->currentPlayList()->nextItem();
+        track = m_pl_manager->currentPlayList()->nextTrack();
 
-    if(item)
+    if(track)
     {
-        bool ok = m_core->play(item->url(), true);
+        bool ok = m_core->play(track->url(), true);
         if(ok)
         {
-            m_nextUrl = item->url();
+            m_nextUrl = track->url();
             qDebug("MediaPlayer: next track state: received");
         }
         else
@@ -231,9 +231,9 @@ void MediaPlayer::updateMetaData()
     qDebug("== end of metadata ==");
 
     PlayListModel *pl = m_pl_manager->currentPlayList();
-    if (pl->currentItem() && pl->currentItem()->url() == m_core->metaData().value(Qmmp::URL))
+    if (pl->currentTrack() && pl->currentTrack()->url() == m_core->metaData().value(Qmmp::URL))
     {
-        pl->currentItem()->updateMetaData(m_core->metaData());
+        pl->currentTrack()->updateMetaData(m_core->metaData());
         pl->doCurrentVisibleRequest();
     }
 }
-- 
cgit v1.2.3-13-gbd6f