fixed time format

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1726 90c681e8-e032-0410-971d-27865f9a5e38

3 files changed, 20 insertions, 15 deletions

diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index 53ba242c8..0c1a0ac33 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -247,10 +247,19 @@ QList <QString> PlayListModel::getTitles(int b,int l)
 QList <QString> PlayListModel::getTimes(int b,int l)
 {
     QList <QString> m_times;
-    for (int i = b;(i < b + l) &&(i < m_items.size()); ++i)
-        m_times << QString("%1").arg(m_items.at(i)->length() /60) +":"
-        +QString("%1").arg(m_items.at(i)->length() %60/10) +
-        QString("%1").arg(m_items.at(i)->length() %60%10);
+    int d = 0;
+    QString str;
+    for (int i = b; (i < b + l) && (i < m_items.size()); ++i)
+    {
+        d = m_items.at(i)->length();
+        if(d > 3600)
+            str += QString("%1:%2").arg(d/3600).arg(d%3600/60, 2, 10, QChar('0'));
+        else
+            str += QString("%1").arg(d%3600/60);
+        str += QString(":%1").arg(d%60, 2, 10, QChar('0'));
+        m_times << str;
+        str.clear();
+    }
     return m_times;
 }
 
diff --git a/src/ui/playlist.cpp b/src/ui/playlist.cpp
index 234df6d26..248fb3453 100644
--- a/src/ui/playlist.cpp
+++ b/src/ui/playlist.cpp
@@ -530,16 +530,9 @@ void PlayList::showSortMenu()
 
 QString PlayList::formatTime (int sec)
 {
-    int minutes = sec / 60;
-    int seconds = sec % 60;
-
-    QString str_minutes = QString::number (minutes);
-    QString str_seconds = QString::number (seconds);
-
-    if (minutes < 10) str_minutes.prepend ("0");
-    if (seconds < 10) str_seconds.prepend ("0");
-
-    return str_minutes + ":" + str_seconds;
+    if(sec > 3600)
+        sec /= 60;
+    return QString("%1:%2").arg(sec/60, 2, 10, QChar('0')).arg(sec%60, 2, 10, QChar('0'));
 }
 
 void PlayList::setTime(qint64 time)
diff --git a/src/ui/timeindicator.cpp b/src/ui/timeindicator.cpp
index 200168c3d..02c185b36 100644
--- a/src/ui/timeindicator.cpp
+++ b/src/ui/timeindicator.cpp
@@ -44,7 +44,7 @@ TimeIndicator::TimeIndicator (QWidget *parent)
     connect(m_timer, SIGNAL(timeout()),SLOT(reset()));
 }
 
-void TimeIndicator::setTime ( int t )
+void TimeIndicator::setTime (int t)
 {
     m_time = t;
     m_pixmap.fill (Qt::transparent);
@@ -59,6 +59,9 @@ void TimeIndicator::setTime ( int t )
     if (t < 0)
         t = 0;
 
+    if(t > 3600)
+        t /= 60;
+
     paint.drawPixmap(r*13,0,m_skin->getNumber(t/600%10));
     paint.drawPixmap(r*26,0,m_skin->getNumber(t/60%10));
     paint.drawPixmap(r*43,0,m_skin->getNumber(t%60/10));