mirror of
https://github.com/dguglielmi/sunny-overlay.git
synced 2025-12-06 20:22:38 +01:00
David Guglielmi
09a17d9652
Mixxx is compiled with Qt5 in ~gx86 and some core features are broken with Qt5, so we need to backport those following patches. - https://github.com/mixxxdj/mixxx/pull/845/commits - https://github.com/mixxxdj/mixxx/pull/848/commits
89 lines
3.0 KiB
Diff
89 lines
3.0 KiB
Diff
From c2af9e6eeb469718b9aa069b90a719fac80dd0d9 Mon Sep 17 00:00:00 2001
|
|
From: Uwe Klotz <uwe_klotz@web.de>
|
|
Date: Fri, 8 Jan 2016 19:25:58 +0100
|
|
Subject: [PATCH] Move definition of Time::formatSeconds() into .cpp file
|
|
|
|
---
|
|
src/util/time.cpp | 30 ++++++++++++++++++++++++++++++
|
|
src/util/time.h | 29 +----------------------------
|
|
2 files changed, 31 insertions(+), 28 deletions(-)
|
|
|
|
diff --git a/src/util/time.cpp b/src/util/time.cpp
|
|
index 998fa73..d8a122b 100644
|
|
--- a/src/util/time.cpp
|
|
+++ b/src/util/time.cpp
|
|
@@ -6,3 +6,33 @@ LLTIMER Time::s_timer;
|
|
bool Time::s_testMode = false;
|
|
// static
|
|
qint64 Time::s_testElapsed_nsecs = 0;
|
|
+
|
|
+// static
|
|
+QString Time::formatSeconds(double dSeconds, bool showCentis) {
|
|
+ if (dSeconds < 0) {
|
|
+ return "?";
|
|
+ }
|
|
+
|
|
+ const int days = static_cast<int>(dSeconds) / kSecondsPerDay;
|
|
+ dSeconds -= days * kSecondsPerDay;
|
|
+
|
|
+ // NOTE(uklotzde): Time() constructs a 'null' object, but
|
|
+ // we need 'zero' here.
|
|
+ QTime t = QTime(0, 0).addMSecs(dSeconds * kMillisPerSecond);
|
|
+
|
|
+ QString formatString =
|
|
+ (days > 0 ? (QString::number(days) %
|
|
+ QLatin1String("'d', ")) : QString()) %
|
|
+ QLatin1String(days > 0 || t.hour() > 0 ? "hh:mm:ss" : "mm:ss") %
|
|
+ QLatin1String(showCentis ? ".zzz" : "");
|
|
+
|
|
+ QString timeString = t.toString(formatString);
|
|
+
|
|
+ // The format string gives us milliseconds but we want
|
|
+ // centiseconds. Slice one character off.
|
|
+ if (showCentis) {
|
|
+ timeString = timeString.left(timeString.length() - 1);
|
|
+ }
|
|
+
|
|
+ return timeString;
|
|
+}
|
|
diff --git a/src/util/time.h b/src/util/time.h
|
|
index 7b38eb4..b4e2c2d 100644
|
|
--- a/src/util/time.h
|
|
+++ b/src/util/time.h
|
|
@@ -67,34 +67,7 @@ class Time {
|
|
// The standard way of formatting a time in seconds. Used for display of
|
|
// track duration, etc. showCentis indicates whether to include
|
|
// centisecond-precision or to round to the nearest second.
|
|
- static QString formatSeconds(double dSeconds, bool showCentis) {
|
|
- if (dSeconds < 0) {
|
|
- return "?";
|
|
- }
|
|
-
|
|
- const int days = static_cast<int>(dSeconds) / kSecondsPerDay;
|
|
- dSeconds -= days * kSecondsPerDay;
|
|
-
|
|
- // NOTE(uklotzde): Time() constructs a 'null' object, but
|
|
- // we need 'zero' here.
|
|
- QTime t = QTime(0, 0).addMSecs(dSeconds * kMillisPerSecond);
|
|
-
|
|
- QString formatString =
|
|
- (days > 0 ? (QString::number(days) %
|
|
- QLatin1String("'d', ")) : QString()) %
|
|
- QLatin1String(days > 0 || t.hour() > 0 ? "hh:mm:ss" : "mm:ss") %
|
|
- QLatin1String(showCentis ? ".zzz" : "");
|
|
-
|
|
- QString timeString = t.toString(formatString);
|
|
-
|
|
- // The format string gives us milliseconds but we want
|
|
- // centiseconds. Slice one character off.
|
|
- if (showCentis) {
|
|
- timeString = timeString.left(timeString.length() - 1);
|
|
- }
|
|
-
|
|
- return timeString;
|
|
- }
|
|
+ static QString formatSeconds(double dSeconds, bool showCentis);
|
|
|
|
private:
|
|
static LLTIMER s_timer;
|