engine: fix beat-based Show playback

yestalgia · Nov 30, 2023 · 8633690 · 8633690
1 parent 435f662
commit 8633690
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 8 deletions.
diff --git a/engine/src/showrunner.cpp b/engine/src/showrunner.cpp
@@ -153,8 +153,18 @@ void ShowRunner::write(MasterTimer *timer)
     // check synchronization to beats (if show is beat-based)
     if (m_show->tempoType() == Function::Beats)
     {
-        if (timer->isBeat() && beatSynced == false)
-            beatSynced = true;
+        //qDebug() << Q_FUNC_INFO << "isBeat:" << timer->isBeat() << ", elapsed beats:" << m_elapsedBeats;
+
+        if (timer->isBeat())
+        {
+            if (beatSynced == false)
+            {
+                beatSynced = true;
+                qDebug() << "Beat synced";
+            }
+            else
+                m_elapsedBeats += 1000;
+        }
 
         if (beatSynced == false)
             return;
@@ -212,12 +222,12 @@ void ShowRunner::write(MasterTimer *timer)
         Function *f = m_doc->function(sf->functionID());
 
         // this should happen only when a Show is not started from 0
-        if (m_elapsedTime > funcStartTime)
+        if (m_elapsedBeats > funcStartTime)
         {
-            functionTimeOffset = m_elapsedTime - funcStartTime;
-            funcStartTime = m_elapsedTime;
+            functionTimeOffset = m_elapsedBeats - funcStartTime;
+            funcStartTime = m_elapsedBeats;
         }
-        if (m_elapsedTime >= funcStartTime)
+        if (m_elapsedBeats >= funcStartTime)
         {
             foreach (Track *track, m_show->tracks())
             {
@@ -246,9 +256,10 @@ void ShowRunner::write(MasterTimer *timer)
     {
         Function *func = m_runningQueue.at(i).first;
         quint32 stopTime = m_runningQueue.at(i).second;
+        quint32 currTime = func->tempoType() == Function::Time ? m_elapsedTime : m_elapsedBeats;
 
         // if we passed the function stop time
-        if (m_elapsedTime >= stopTime)
+        if (currTime >= stopTime)
         {
             // stop the function
             func->stop(functionParent());

diff --git a/qmlui/js/TimeUtils.js b/qmlui/js/TimeUtils.js
@@ -43,7 +43,11 @@ function msToString(ms)
     finalTime += ((m < 10) ? "0" + m : m) + ":";
     finalTime += ((s < 10) ? "0" + s : s);
     if (ms) {
-        finalTime += "." + ((ms < 10) ? "0" + parseInt(ms) : parseInt(ms));
+        finalTime += ".";
+        if (ms < 10) finalTime += "00";
+        else if (ms < 100) finalTime += "0";
+
+        finalTime += parseInt(ms);
     }
     return finalTime;
 }

diff --git a/qmlui/showmanager.cpp b/qmlui/showmanager.cpp
@@ -161,6 +161,16 @@ void ShowManager::setTimeDivision(Show::TimeDivision division)
     if (division == m_currentShow->timeDivisionType())
         return;
 
+    if (division == Show::Time)
+    {
+        setTimeScale(5.0);
+        m_currentShow->setTempoType(Function::Time);
+    }
+    else
+    {
+        setTimeScale(1.0);
+        m_currentShow->setTempoType(Function::Beats);
+    }
     m_currentShow->setTimeDivisionType(division);
     emit timeDivisionChanged(division);