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

3 files changed, 8 insertions, 8 deletions

diff --git a/src/plugins/Ui/qsui/listwidget.cpp b/src/plugins/Ui/qsui/listwidget.cpp
index 5f231fb53..0a529addb 100644
--- a/src/plugins/Ui/qsui/listwidget.cpp
+++ b/src/plugins/Ui/qsui/listwidget.cpp
@@ -619,8 +619,8 @@ const QString ListWidget::getExtraString(PlayListItem *item)
     QString extra_string;
     PlayListTrack *track = static_cast<PlayListTrack *>(item);
 
-    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))
     {
@@ -721,7 +721,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/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp
index 7b5b209c9..9be5ff0b2 100644
--- a/src/plugins/Ui/qsui/mainwindow.cpp
+++ b/src/plugins/Ui/qsui/mainwindow.cpp
@@ -366,7 +366,7 @@ void MainWindow::playPause()
 void MainWindow::updateStatus()
 {
     int tracks = m_pl_manager->currentPlayList()->trackCount();
-    int length = m_pl_manager->currentPlayList()->totalLength();
+    int duration = m_pl_manager->currentPlayList()->totalDuration();
 
     if(m_core->state() == Qmmp::Playing || m_core->state() == Qmmp::Paused)
     {
@@ -377,7 +377,7 @@ void MainWindow::updateStatus()
                                .arg(ap.channels())
                                .arg(ap.sampleRate())
                                .arg(tracks)
-                               .arg(MetaDataFormatter::formatDuration(length * 1000, false)) //TODO use milliseconds
+                               .arg(MetaDataFormatter::formatDuration(duration, false))
                                .arg(m_core->bitrate()));
     }
     else if(m_core->state() == Qmmp::Stopped)
@@ -385,7 +385,7 @@ void MainWindow::updateStatus()
         m_statusLabel->setText(tr("<b>%1</b>|tracks: %2|total time: %3|")
                                .arg(tr("Stopped"))
                                .arg(tracks)
-                               .arg(MetaDataFormatter::formatDuration(length * 1000))); //TODO use milliseconds
+                               .arg(MetaDataFormatter::formatDuration(duration )));
     }
     else
         m_statusLabel->clear();
@@ -894,7 +894,7 @@ void MainWindow::showMetaData()
 {
     PlayListModel *model = m_pl_manager->currentPlayList();
     PlayListTrack *track = model->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/qsui/popupwidget.cpp b/src/plugins/Ui/qsui/popupwidget.cpp
index 47921a45d..dcad92917 100644
--- a/src/plugins/Ui/qsui/popupwidget.cpp
+++ b/src/plugins/Ui/qsui/popupwidget.cpp
@@ -91,7 +91,7 @@ void PopupWidget::prepare(PlayListTrack *track, QPoint pos)
         return;
     }
 
-    m_url = track->url();
+    m_url = track->path();
     m_label1->setText(m_formatter.format(track));
     qApp->processEvents();
     updateGeometry ();