changed playlist API, fixed some issues

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

5 files changed, 10 insertions, 10 deletions

diff --git a/src/plugins/Ui/skinned/eqwidget.cpp b/src/plugins/Ui/skinned/eqwidget.cpp
index 78ef021d9..f11074bfb 100644
--- a/src/plugins/Ui/skinned/eqwidget.cpp
+++ b/src/plugins/Ui/skinned/eqwidget.cpp
@@ -333,12 +333,12 @@ void EqWidget::saveAutoPreset()
     if (!track)
         return;
     //delete preset if it already exists
-    EQPreset* preset = findPreset(track->url().section("/",-1));
+    EQPreset* preset = findPreset(track->path().section("/",-1));
     if (preset)
         deletePreset(preset);
     //create new preset
     preset = new EQPreset();
-    preset->setText(track->url().section("/",-1));
+    preset->setText(track->path().section("/",-1));
     preset->setPreamp(m_preamp->value());
     for (int i = 0; i<10; ++i)
     {
diff --git a/src/plugins/Ui/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp
index e415aae71..4086a8f43 100644
--- a/src/plugins/Ui/skinned/listwidget.cpp
+++ b/src/plugins/Ui/skinned/listwidget.cpp
@@ -529,8 +529,8 @@ const QString ListWidget::getExtraString(int i)
     if(!track)
         return extra_string;
 
-    if (m_show_protocol && track->url().contains("://"))
-        extra_string = "[" + track->url().split("://").at(0) + "]";
+    if (m_show_protocol && track->path().contains("://"))
+        extra_string = "[" + track->path().split("://").at(0) + "]";
 
     if (m_model->isQueued(track))
     {
@@ -606,7 +606,7 @@ void ListWidget::mouseMoveEvent(QMouseEvent *e)
     else if(m_popupWidget)
     {
         int index = indexAt(e->y());
-        if(index < 0 || !m_model->isTrack(index) || m_popupWidget->url() != m_model->track(index)->url())
+        if(index < 0 || !m_model->isTrack(index) || m_popupWidget->url() != m_model->track(index)->path())
             m_popupWidget->deactivate();
     }
 }
diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index 5108d71e9..388f1d71c 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -190,7 +190,7 @@ void MainWindow::showState(Qmmp::State state)
     {
     case Qmmp::Playing:
         if (m_pl_manager->currentPlayList()->currentTrack())
-            m_equalizer->loadPreset(m_pl_manager->currentPlayList()->currentTrack()->url().section("/",-1));
+            m_equalizer->loadPreset(m_pl_manager->currentPlayList()->currentTrack()->path().section("/",-1));
         break;
     case Qmmp::Paused:
         break;
@@ -203,7 +203,7 @@ void MainWindow::showState(Qmmp::State state)
 void MainWindow::showMetaData()
 {
     PlayListTrack *track = m_pl_manager->currentPlayList()->currentTrack();
-    if (track && track->url() == m_core->metaData().value(Qmmp::URL))
+    if (track && track->path() == m_core->metaData().value(Qmmp::URL))
     {
         setWindowTitle(m_titleFormatter.format(track));
     }
diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp
index 13f9819f0..6c57fbd9f 100644
--- a/src/plugins/Ui/skinned/playlist.cpp
+++ b/src/plugins/Ui/skinned/playlist.cpp
@@ -576,8 +576,8 @@ void PlayList::setTime(qint64 time)
 
     if (SoundCore::instance())
     {
-        QString str_length = formatTime (m_pl_manager->currentPlayList()->totalLength()) +
-                             "/" + formatTime (SoundCore::instance()->duration()/1000);
+        QString str_length = formatTime (m_pl_manager->currentPlayList()->totalDuration() / 1000) +
+                             "/" + formatTime (SoundCore::instance()->duration() / 1000);
         m_length_totalLength->display (str_length);
         m_length_totalLength->update();
     }
diff --git a/src/plugins/Ui/skinned/popupwidget.cpp b/src/plugins/Ui/skinned/popupwidget.cpp
index 10fa811bc..ba82c359b 100644
--- a/src/plugins/Ui/skinned/popupwidget.cpp
+++ b/src/plugins/Ui/skinned/popupwidget.cpp
@@ -92,7 +92,7 @@ void PopupWidget::prepare(PlayListTrack *item, QPoint pos)
         m_url.clear();
         return;
     }
-    m_url = item->url();
+    m_url = item->path();
     m_label1->setText(m_formatter.format(item));
     qApp->processEvents();
     updateGeometry ();