fix: freeze when opening new score while running

philippekocher · Nov 6, 2023 · a7ff1fe · a7ff1fe
1 parent 31cb0c0
commit a7ff1fe
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/Source/Scheduler/Polytempo_Event.h b/Source/Scheduler/Polytempo_Event.h
@@ -12,21 +12,21 @@ enum Polytempo_EventType
 
     eventType_Tick,
     eventType_Beat,
-    eventType_Marker, // 4
+    eventType_Marker,
 
     eventType_Start,
     eventType_Stop,
     eventType_Pause,
 
     eventType_GotoMarker,
-    eventType_GotoTime,  // 9
+    eventType_GotoTime,
     eventType_TempoFactor,
 
     eventType_LoadImage,
     eventType_AddRegion,
     eventType_AddSection,
 
-    eventType_Image,  // 14
+    eventType_Image,
     eventType_AppendImage,
     eventType_Text,
     eventType_Progressbar,

diff --git a/Source/Scheduler/Polytempo_ScoreScheduler.cpp b/Source/Scheduler/Polytempo_ScoreScheduler.cpp
@@ -232,18 +232,27 @@ void Polytempo_ScoreScheduler::executeInit()
 #ifdef USING_SCORE
 void Polytempo_ScoreScheduler::setScore(Polytempo_Score* theScore)
 {
+    // set new score
+    newScore = theScore;
+
     // reset / delete everything that belongs to an old score
     if(engine->isRunning()) {
-         Polytempo_EventScheduler::getInstance()->deletePendingEvents();
-         engine->stop();
-         engine->kill();
-     }
+        Polytempo_EventScheduler::getInstance()->deletePendingEvents();
+        engine->kill();
+    }
+    else swapScores();
+}
+
+void Polytempo_ScoreScheduler::swapScores()
+{
+    if (score == newScore) return;
+
     Polytempo_EventScheduler::getInstance()->scheduleEvent(Polytempo_Event::makeEvent(eventType_DeleteAll));
     Polytempo_EventScheduler::getInstance()->scheduleEvent(Polytempo_Event::makeEvent(eventType_TempoFactor, 1.0));
 
     // set new score
-    score = theScore;
-    engine->setScore(theScore);
+    score = newScore;
+    engine->setScore(score);
 
     executeInit();
 

diff --git a/Source/Scheduler/Polytempo_ScoreScheduler.h b/Source/Scheduler/Polytempo_ScoreScheduler.h
@@ -44,6 +44,7 @@ class Polytempo_ScoreScheduler : public Polytempo_EventObserver
      --------------------------------------- */
 #ifdef USING_SCORE
     void setScore(Polytempo_Score* score_);
+    void swapScores();
 #endif
     int getScoreTime();
 
@@ -55,5 +56,6 @@ class Polytempo_ScoreScheduler : public Polytempo_EventObserver
 
 #ifdef USING_SCORE
     Polytempo_Score* score = nullptr;
+    Polytempo_Score* newScore = nullptr;
 #endif
 };
diff --git a/Source/Scheduler/Polytempo_ScoreSchedulerEngine.cpp b/Source/Scheduler/Polytempo_ScoreSchedulerEngine.cpp
@@ -181,6 +181,8 @@ void Polytempo_NetworkEngine::run()
         scoreScheduler->gotoTime(lastDownbeat);
         shouldReturnToLastDownbeat = false;
     }
+
+    if(killed) MessageManager::callAsync([this]() { scoreScheduler->swapScores(); });
 
     Polytempo_NetworkApplication* const app = dynamic_cast<Polytempo_NetworkApplication*>(JUCEApplication::getInstance());
     if (app->quitApplication) app->applicationShouldQuit();