aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Ui
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2018-04-30 09:48:54 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2018-04-30 09:48:54 +0000
commitad55f26545292e0dc2ffc66a43f8bd3b74eb32bc (patch)
tree6ea1049499c18cc36a01f059450ca6ff5ce38f75 /src/plugins/Ui
parent099c570384563311d03a97fa975319aeafe62adc (diff)
downloadqmmp-ad55f26545292e0dc2ffc66a43f8bd3b74eb32bc.tar.gz
qmmp-ad55f26545292e0dc2ffc66a43f8bd3b74eb32bc.tar.bz2
qmmp-ad55f26545292e0dc2ffc66a43f8bd3b74eb32bc.zip
fixed duration formatting
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7938 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Ui')
-rw-r--r--src/plugins/Ui/qsui/mainwindow.cpp8
-rw-r--r--src/plugins/Ui/qsui/positionslider.cpp2
-rw-r--r--src/plugins/Ui/skinned/display.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp
index a482aff4e..7b5b209c9 100644
--- a/src/plugins/Ui/qsui/mainwindow.cpp
+++ b/src/plugins/Ui/qsui/mainwindow.cpp
@@ -203,11 +203,11 @@ void MainWindow::updatePosition(qint64 pos)
if(!m_positionSlider->isSliderDown())
m_positionSlider->setValue(pos/1000);
- QString text = MetaDataFormatter::formatLength(pos/1000, false);
+ QString text = MetaDataFormatter::formatDuration(pos, false);
if(m_core->duration() > 1000)
{
text.append("/");
- text.append(MetaDataFormatter::formatLength(m_core->duration()/1000));
+ text.append(MetaDataFormatter::formatDuration(m_core->duration()));
}
m_timeLabel->setText(text);
}
@@ -377,7 +377,7 @@ void MainWindow::updateStatus()
.arg(ap.channels())
.arg(ap.sampleRate())
.arg(tracks)
- .arg(MetaDataFormatter::formatLength(length, false))
+ .arg(MetaDataFormatter::formatDuration(length * 1000, false)) //TODO use milliseconds
.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::formatLength(length)));
+ .arg(MetaDataFormatter::formatDuration(length * 1000))); //TODO use milliseconds
}
else
m_statusLabel->clear();
diff --git a/src/plugins/Ui/qsui/positionslider.cpp b/src/plugins/Ui/qsui/positionslider.cpp
index aebe6d734..bfd0a682d 100644
--- a/src/plugins/Ui/qsui/positionslider.cpp
+++ b/src/plugins/Ui/qsui/positionslider.cpp
@@ -83,5 +83,5 @@ void PositionSlider::onSliderMoved(int pos)
initStyleOption(&opt);
QRect rect = style()->subControlRect(QStyle::CC_Slider, &opt, QStyle::SC_SliderHandle, this);
rect.moveTo(rect.x() - 10 , rect.y() - 45);
- QToolTip::showText(mapToGlobal(rect.topLeft()), MetaDataFormatter::formatLength(pos), this, QRect());
+ QToolTip::showText(mapToGlobal(rect.topLeft()), MetaDataFormatter::formatDuration(pos * 1000), this, QRect());
}
diff --git a/src/plugins/Ui/skinned/display.cpp b/src/plugins/Ui/skinned/display.cpp
index 45b3ec70f..ef12f595e 100644
--- a/src/plugins/Ui/skinned/display.cpp
+++ b/src/plugins/Ui/skinned/display.cpp
@@ -307,7 +307,7 @@ void MainDisplay::displayVolume()
void MainDisplay::showPosition()
{
- m_text->setText(tr("Seek to: %1").arg(MetaDataFormatter::formatLength(m_posbar->value() / 1000, false)));
+ m_text->setText(tr("Seek to: %1").arg(MetaDataFormatter::formatDuration(m_posbar->value(), false)));
}
void MainDisplay::updatePosition()