Fix display of time units

2 files changed, 13 insertions, 10 deletions

diff --git a/metadatamodel.cpp b/metadatamodel.cpp
index 387747b..b46daa5 100644
--- a/metadatamodel.cpp
+++ b/metadatamodel.cpp
@@ -15,15 +15,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "metadatamodel.h"
+
+#include <math.h>
+
 #include <QDBusArgument>
 #include <qdebug.h>
 
-static QString formatTimeNs(qlonglong time)
+static QString formatTimeUs(qlonglong time)
 {
-    qlonglong secs = time / 1000000;
+    qlonglong secs = static_cast<qlonglong>(round(time / 1000000.0));
     qlonglong mins = secs / 60;
     secs = secs % 60;
-    return QString::number(time) + "ns ("
+    return QString::number(time) + QString::fromUtf8("µs (")
             + QString::number(mins) + ":"
             + QString::number(secs).rightJustified(2, '0') + ")";
 }
@@ -68,7 +71,7 @@ QVariant MetadataModel::data(const QModelIndex& index, int role) const
                     return m_metadata[key].value<QDBusObjectPath>().path();
                 } else {
                     if (key == "mpris:length" && m_metadata[key].canConvert(QVariant::LongLong)) {
-                        return formatTimeNs(m_metadata[key].toLongLong());
+                        return formatTimeUs(m_metadata[key].toLongLong());
                     } else {
                         return m_metadata[key];
                     }
diff --git a/mpris2/playertestwidget.cpp b/mpris2/playertestwidget.cpp
index 3a7ca74..8a6a21a 100644
--- a/mpris2/playertestwidget.cpp
+++ b/mpris2/playertestwidget.cpp
@@ -102,12 +102,12 @@ void PlayerTestWidget::runIncrementalTest()
     test->incrementalTest();
 }
 
-static QString formatTimeNs(qlonglong time)
+static QString formatTimeUs(qlonglong time)
 {
     qlonglong secs = static_cast<qlonglong>(round(time / 1000000.0));
     qlonglong mins = secs / 60;
     secs = secs % 60;
-    return QString::number(time) + "us ("
+    return QString::number(time) + QString::fromUtf8("µs (")
             + QString::number(mins) + ":"
             + QString::number(secs).rightJustified(2, '0') + ")";
 }
@@ -130,14 +130,14 @@ void PlayerTestWidget::propertiesChanged(const QStringList& properties)
     updateDoublePropLabel("MaximumRate", ui.maxRateLbl);
     updateDoublePropLabel("Volume", ui.volumeLbl);
     if (test->properties().contains("Position")) {
-        ui.lastKnownPosLbl->setText(formatTimeNs(test->properties().value("Position").toLongLong()));
+        ui.lastKnownPosLbl->setText(formatTimeUs(test->properties().value("Position").toLongLong()));
         ui.lastKnownPosLbl->setEnabled(true);
     } else {
         ui.lastKnownPosLbl->setText("<unknown>");
         ui.lastKnownPosLbl->setEnabled(false);
     }
     if (test->predictedPosition() >= 0) {
-        ui.estPosLbl->setText(formatTimeNs(test->predictedPosition()));
+        ui.estPosLbl->setText(formatTimeUs(test->predictedPosition()));
         ui.estPosLbl->setEnabled(true);
         if (!estPosTimer->isActive())
             estPosTimer->start();
@@ -167,7 +167,7 @@ void PlayerTestWidget::propertiesChanged(const QStringList& properties)
 void PlayerTestWidget::updateEstPos()
 {
     if (test->predictedPosition() >= 0) {
-        ui.estPosLbl->setText(formatTimeNs(test->predictedPosition()));
+        ui.estPosLbl->setText(formatTimeUs(test->predictedPosition()));
         ui.estPosLbl->setEnabled(true);
     } else {
         ui.estPosLbl->setText("<unknown>");
@@ -202,7 +202,7 @@ void PlayerTestWidget::testOpenUri()
 
 void PlayerTestWidget::Seeked(qint64 position)
 {
-    ui.lastKnownPosLbl->setText(formatTimeNs(position));
+    ui.lastKnownPosLbl->setText(formatTimeUs(position));
     ui.lastKnownPosLbl->setEnabled(true);
 }