aboutsummaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/General/hal/halplugin.cpp4
-rw-r--r--src/plugins/General/udisks2/udisks2plugin.cpp6
-rw-r--r--src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp16
-rw-r--r--src/plugins/PlayListFormats/pls/plsplaylistformat.cpp14
-rw-r--r--src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp24
-rw-r--r--src/plugins/Ui/qsui/listwidget.cpp6
-rw-r--r--src/plugins/Ui/qsui/mainwindow.cpp8
-rw-r--r--src/plugins/Ui/qsui/popupwidget.cpp2
-rw-r--r--src/plugins/Ui/skinned/eqwidget.cpp4
-rw-r--r--src/plugins/Ui/skinned/listwidget.cpp6
-rw-r--r--src/plugins/Ui/skinned/mainwindow.cpp4
-rw-r--r--src/plugins/Ui/skinned/playlist.cpp4
-rw-r--r--src/plugins/Ui/skinned/popupwidget.cpp2
13 files changed, 50 insertions, 50 deletions
diff --git a/src/plugins/General/hal/halplugin.cpp b/src/plugins/General/hal/halplugin.cpp
index 6deabcfd3..dfea19cf9 100644
--- a/src/plugins/General/hal/halplugin.cpp
+++ b/src/plugins/General/hal/halplugin.cpp
@@ -243,7 +243,7 @@ void HalPlugin::addPath(const QString &path)
{
if(item->isGroup())
continue;
- if (dynamic_cast<PlayListTrack *>(item)->url().startsWith(path))
+ if (dynamic_cast<PlayListTrack *>(item)->path().startsWith(path))
return;
}
@@ -267,7 +267,7 @@ void HalPlugin::removePath(const QString &path)
int i = 0;
while (model->count() > 0 && i < model->count())
{
- if (model->isTrack(i) && model->track(i)->url().startsWith(path))
+ if (model->isTrack(i) && model->track(i)->path().startsWith(path))
model->removeTrack(i);
else
++i;
diff --git a/src/plugins/General/udisks2/udisks2plugin.cpp b/src/plugins/General/udisks2/udisks2plugin.cpp
index d390d8824..8a37b00e1 100644
--- a/src/plugins/General/udisks2/udisks2plugin.cpp
+++ b/src/plugins/General/udisks2/udisks2plugin.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2013-2014 by Ilya Kotov *
+ * Copyright (C) 2013-2018 by Ilya Kotov *
* forkotov02@ya.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -217,7 +217,7 @@ void UDisks2Plugin::addPath(const QString &path)
{
if(item->isGroup())
continue;
- if (dynamic_cast<PlayListTrack *>(item)->url().startsWith(path))
+ if (dynamic_cast<PlayListTrack *>(item)->path().startsWith(path))
return;
}
@@ -241,7 +241,7 @@ void UDisks2Plugin::removePath(const QString &path)
int i = 0;
while (model->count() > 0 && i < model->count())
{
- if (model->isTrack(i) && model->track(i)->url().startsWith(path))
+ if (model->isTrack(i) && model->track(i)->path().startsWith(path))
model->removeTrack(i);
else
++i;
diff --git a/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp b/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp
index feb31fa19..dca7bac33 100644
--- a/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp
+++ b/src/plugins/PlayListFormats/m3u/m3uplaylistformat.cpp
@@ -62,13 +62,13 @@ QList<PlayListTrack *> M3UPlaylistFormat::decode(const QByteArray &contents)
continue;
out << new PlayListTrack();
- out.last()->insert(Qmmp::URL, str);
+ out.last()->setPath(str);
if(hasExtInf)
{
- out.last()->setLength(length);
- out.last()->insert(Qmmp::ARTIST, artist);
- out.last()->insert(Qmmp::TITLE, title);
+ out.last()->setDuration(length * 1000);
+ out.last()->setValue(Qmmp::ARTIST, artist);
+ out.last()->setValue(Qmmp::TITLE, title);
hasExtInf = false;
}
}
@@ -84,19 +84,19 @@ QByteArray M3UPlaylistFormat::encode(const QList<PlayListTrack*> &contents, cons
foreach(PlayListTrack* f, contents)
{
- QString info = "#EXTINF:" + QString::number(f->length()) + "," + formatter.format(f);
+ QString info = "#EXTINF:" + QString::number(f->duration() / 1000) + "," + formatter.format(f);
out.append(info);
- if(!f->url().contains("://") && f->url().startsWith(m3uDir))
+ if(!f->path().contains("://") && f->path().startsWith(m3uDir))
{
- QString p = f->url();
+ QString p = f->path();
p.remove(0, m3uDir.size());
if(p.startsWith("/"))
p.remove(0, 1);
out.append(p);
}
else
- out.append(f->url());
+ out.append(f->path());
}
return out.join("\n").toUtf8();
}
diff --git a/src/plugins/PlayListFormats/pls/plsplaylistformat.cpp b/src/plugins/PlayListFormats/pls/plsplaylistformat.cpp
index 1e96077dc..47ba32822 100644
--- a/src/plugins/PlayListFormats/pls/plsplaylistformat.cpp
+++ b/src/plugins/PlayListFormats/pls/plsplaylistformat.cpp
@@ -65,7 +65,7 @@ QList<PlayListTrack *> PLSPlaylistFormat::decode(const QByteArray &contents)
{
while(number > out.count())
out << new PlayListTrack();
- out[number - 1]->insert(Qmmp::URL, fileRegExp.cap(2));
+ out[number - 1]->setPath(fileRegExp.cap(2));
}
else
error = true;
@@ -76,8 +76,8 @@ QList<PlayListTrack *> PLSPlaylistFormat::decode(const QByteArray &contents)
{
while(number > out.count())
out << new PlayListTrack();
- out[number - 1]->insert(Qmmp::ARTIST, fullTitleRegExp.cap(2));
- out[number - 1]->insert(Qmmp::TITLE, fullTitleRegExp.cap(3));
+ out[number - 1]->setValue(Qmmp::ARTIST, fullTitleRegExp.cap(2));
+ out[number - 1]->setValue(Qmmp::TITLE, fullTitleRegExp.cap(3));
}
else
error = true;
@@ -88,7 +88,7 @@ QList<PlayListTrack *> PLSPlaylistFormat::decode(const QByteArray &contents)
{
while(number > out.count())
out << new PlayListTrack();
- out[number - 1]->insert(Qmmp::TITLE, titleRegExp.cap(2));
+ out[number - 1]->setValue(Qmmp::TITLE, titleRegExp.cap(2));
}
else
error = true;
@@ -99,7 +99,7 @@ QList<PlayListTrack *> PLSPlaylistFormat::decode(const QByteArray &contents)
{
while(number > out.count())
out << new PlayListTrack();
- out[number - 1]->setLength(lengthRegExp.cap(2).toInt());
+ out[number - 1]->setDuration(lengthRegExp.cap(2).toInt() * 1000);
}
else
error = true;
@@ -127,11 +127,11 @@ QByteArray PLSPlaylistFormat::encode(const QList<PlayListTrack *> &contents, con
foreach(PlayListTrack *f, contents)
{
QString begin = "File" + QString::number(counter) + "=";
- out.append(begin + f->url());
+ out.append(begin + f->path());
begin = "Title" + QString::number(counter) + "=";
out.append(begin + formatter.format(f));
begin = "Length" + QString::number(counter) + "=";
- out.append(begin + QString::number(f->length()));
+ out.append(begin + QString::number(f->duration() / 1000));
counter++;
}
out << "NumberOfEntries=" + QString::number(contents.count());
diff --git a/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp b/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp
index f20c83903..7a66bc7bb 100644
--- a/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp
+++ b/src/plugins/PlayListFormats/xspf/xspfplaylistformat.cpp
@@ -72,29 +72,29 @@ QList<PlayListTrack*> XSPFPlaylistFormat::decode(const QByteArray &contents)
{
QUrl url(xml.text().toString());
if (url.scheme() == "file") //remove scheme for local files only
- out.last()->insert(Qmmp::URL, QUrl::fromPercentEncoding(url.toString().toLatin1()).remove("file://"));
+ out.last()->setPath(QUrl::fromPercentEncoding(url.toString().toLatin1()).remove("file://"));
else
- out.last()->insert(Qmmp::URL, QUrl::fromPercentEncoding(url.toString().toLatin1()));
+ out.last()->setPath(QUrl::fromPercentEncoding(url.toString().toLatin1()));
}
else if(currentTag == "title")
{
- out.last()->insert(Qmmp::TITLE, xml.text().toString());
+ out.last()->setValue(Qmmp::TITLE, xml.text().toString());
}
else if(currentTag == "creator")
{
- out.last()->insert(Qmmp::ARTIST, xml.text().toString());
+ out.last()->setValue(Qmmp::ARTIST, xml.text().toString());
}
else if(currentTag == "annotation")
{
- out.last()->insert(Qmmp::COMMENT, xml.text().toString());
+ out.last()->setValue(Qmmp::COMMENT, xml.text().toString());
}
else if(currentTag == "album")
{
- out.last()->insert(Qmmp::ALBUM, xml.text().toString());
+ out.last()->setValue(Qmmp::ALBUM, xml.text().toString());
}
else if(currentTag == "meta" && xml.attributes().value("rel") == "year")
{
- out.last()->insert(Qmmp::YEAR, xml.text().toString());
+ out.last()->setValue(Qmmp::YEAR, xml.text().toString());
}
else
xml.skipCurrentElement();
@@ -131,13 +131,13 @@ QByteArray XSPFPlaylistFormat::encode(const QList<PlayListTrack*> &files, const
xml.writeStartElement("track");
QString url;
- if (f->url().contains("://"))
+ if (f->path().contains("://"))
{
- url = QUrl::toPercentEncoding(f->url(), ":/");
+ url = QUrl::toPercentEncoding(f->path(), ":/");
}
- else if(f->url().startsWith(xspfDir)) //relative path
+ else if(f->path().startsWith(xspfDir)) //relative path
{
- QString p = f->url();
+ QString p = f->path();
p.remove(0, xspfDir.size());
if(p.startsWith("/"))
p.remove(0, 1);
@@ -145,7 +145,7 @@ QByteArray XSPFPlaylistFormat::encode(const QList<PlayListTrack*> &files, const
}
else //absolute path
{
- url = QUrl::toPercentEncoding(QLatin1String("file://") + f->url(), ":/");
+ url = QUrl::toPercentEncoding(QLatin1String("file://") + f->path(), ":/");
}
xml.writeTextElement("location", url);
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 ();
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 ();
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-17 06:02:52 +0000