From e2f78b8713a26a1f7aac119ffeea8ad9e1c16eed Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Mon, 30 Apr 2018 22:38:26 +0000
Subject: fixed some regressions

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7942 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Effect/filewriter/filewriterplugin.cpp | 2 +-
 src/plugins/General/statusicon/statusicon.cpp      | 4 ++--
 src/plugins/Ui/skinned/textscroller.cpp            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/Effect/filewriter/filewriterplugin.cpp b/src/plugins/Effect/filewriter/filewriterplugin.cpp
index f2ed0d793..f7646d0a4 100644
--- a/src/plugins/Effect/filewriter/filewriterplugin.cpp
+++ b/src/plugins/Effect/filewriter/filewriterplugin.cpp
@@ -123,7 +123,7 @@ void FileWriterPlugin::init(const QMap<Qmmp::MetaData, QString> &metaData)
         fileName = metaData[Qmmp::URL].section("/", 1);
 
     MetaDataFormatter formatter(fileName);
-    fileName = formatter.format(metaData, SoundCore::instance()->duration() / 1000);
+    fileName = formatter.format(metaData, SoundCore::instance()->duration());
     if(!fileName.endsWith(".ogg", Qt::CaseInsensitive))
         fileName.append(".ogg");
 
diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp
index 21f1a6519..86a260324 100644
--- a/src/plugins/General/statusicon/statusicon.cpp
+++ b/src/plugins/General/statusicon/statusicon.cpp
@@ -136,7 +136,7 @@ void StatusIcon::showMetaData()
         }
     }
 
-    QString message = m_messageFormatter.format(meta, m_core->duration() / 1000);
+    QString message = m_messageFormatter.format(meta, m_core->duration());
     if (message.isEmpty())
         message = meta[Qmmp::URL].section('/',-1);
 
@@ -146,7 +146,7 @@ void StatusIcon::showMetaData()
 
     if(m_showToolTip)
     {
-        message = m_toolTipFormatter.format(meta, m_core->duration() / 1000);
+        message = m_toolTipFormatter.format(meta, m_core->duration());
         if(message.isEmpty())
             message = meta[Qmmp::URL].section('/',-1);
         m_tray->setToolTip(message);
diff --git a/src/plugins/Ui/skinned/textscroller.cpp b/src/plugins/Ui/skinned/textscroller.cpp
index 3f9d3d1bd..ffd69ad2e 100644
--- a/src/plugins/Ui/skinned/textscroller.cpp
+++ b/src/plugins/Ui/skinned/textscroller.cpp
@@ -253,7 +253,7 @@ void TextScroller::processMetaData()
 {
     if(m_core->state() == Qmmp::Playing)
     {
-        m_titleText = m_formater.format(m_core->metaData(), m_core->duration()/1000);
+        m_titleText = m_formater.format(m_core->metaData(), m_core->duration());
         updateText();
     }
 }
-- 
cgit v1.2.3-13-gbd6f