Optimize time remaining calculation.

jlertle · Sep 9, 2018 · c678a45 · c678a45
1 parent 0d150c5
commit c678a45
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 30 deletions.
diff --git a/Screens/Views/Deck/TrackDeck.qml b/Screens/Views/Deck/TrackDeck.qml
@@ -112,7 +112,7 @@ Item {
       horizontalAlignment: Text.AlignRight
       verticalAlignment:   Text.AlignVCenter
       color:               colors.textColors[deckId]
-      text:                utils.computeRemainingTimeString(trackLength.value, elapsedTime.value)
+      text:                "-" + utils.computeRemainingTimeString(trackLength.value, elapsedTime.value)
     }
   }
 

diff --git a/Screens/Views/Definitions/Utils.qml b/Screens/Views/Definitions/Utils.qml
@@ -4,29 +4,12 @@ QtObject {
 
   function convertToTimeString(inSeconds)
   {
-    var neg = (inSeconds < 0);
-    var roundedSec = Math.floor(inSeconds);
-
-    if (neg)
-    {
-      roundedSec = -roundedSec;
-    }
-
-    var sec = roundedSec % 60;
-    var min = (roundedSec - sec) / 60;
-
-    var secStr = sec.toString();
-    if (sec < 10) secStr = "0" + secStr;
-
-    var minStr = min.toString();
-//    if (min < 10) minStr = "0" + minStr;
-
-    return (neg ? "-" : "") + minStr + ":" + secStr;
+    return Math.floor(inSeconds / 60).toString() + ":" + ("0" + Math.abs(Math.floor(inSeconds % 60)).toString()).slice(-2);
   }
 
   function computeRemainingTimeString(length, elapsed)
   {
-    return ((elapsed > length) ? convertToTimeString(0) : convertToTimeString( Math.floor(elapsed) - Math.floor(length)));
+    return elapsed > length ? convertToTimeString(0) : convertToTimeString( Math.floor(length) - Math.floor(elapsed));
   }
 
   function getKeyOffset(offset)
@@ -67,16 +50,6 @@ QtObject {
     return "";
   }
 
-  function getKeyMatchText(masterKey, trackKey)
-  {
-      var keyOffset = getMasterKeyOffset(masterKey, trackKey);
-
-      if (keyOffset == 0) return ">";
-      else if (keyOffset > 0) return "U";
-      else if (keyOffset < 0) return "D";
-      else return "-";
-  }
-
   function convertToCamelot(keyToConvert)
   {
     if (keyToConvert == "") return "-";