Fix a race when the playback parameters were changing under a patch w…

…hich was being recompiled
cmajor-lang · Jun 18, 2024 · 70d13fa · 70d13fa
1 parent ae561a0
commit 70d13fa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/include/cmajor/helpers/cmaj_AudioMIDIPerformer.h b/include/cmajor/helpers/cmaj_AudioMIDIPerformer.h
@@ -246,8 +246,6 @@ inline bool AudioMIDIPerformer::Builder::connectAudioInputTo (const std::vector<
 {
     CMAJ_ASSERT (inputChannels.size() == endpointChannels.size());
 
-    result->preRenderFunctions.clear();
-
     if (auto numChannelsInEndpoint = getNumFloatChannelsInStream (endpoint))
     {
         ensureInputScratchBufferChannelCount (numChannelsInEndpoint);

diff --git a/include/cmajor/helpers/cmaj_Patch.h b/include/cmajor/helpers/cmaj_Patch.h
@@ -992,7 +992,7 @@ struct Patch::PatchRenderer  : public std::enable_shared_from_this<PatchRenderer
     //==============================================================================
     void build (cmaj::Engine& engine,
                 LoadParams& loadParams,
-                const PlaybackParams& playbackParams,
+                PlaybackParams playbackParams,
                 bool shouldResolveExternals,
                 bool shouldLink,
                 const cmaj::CacheDatabaseInterface::Ptr& c,
@@ -1001,6 +1001,7 @@ struct Patch::PatchRenderer  : public std::enable_shared_from_this<PatchRenderer
     {
         try
         {
+            configuredPlaybackParams = playbackParams;
             manifest = std::move (loadParams.manifest);
 
             if (! loadProgram (engine, playbackParams, shouldResolveExternals, checkForStopSignal))
@@ -1485,6 +1486,7 @@ struct Patch::PatchRenderer  : public std::enable_shared_from_this<PatchRenderer
     PatchManifest manifest;
     cmaj::DiagnosticMessageList errors;
     std::string lastBuildLog;
+    PlaybackParams configuredPlaybackParams;
 
     choc::value::Value programDetails;
     std::vector<PatchParameterPtr> parameterList;
@@ -2356,6 +2358,9 @@ inline void Patch::setNewRenderer (std::shared_ptr<PatchRenderer> newRenderer)
     if (renderer == nullptr && newRenderer == nullptr)
         return;
 
+    if (currentPlaybackParams != newRenderer->configuredPlaybackParams)
+        return;
+
     if (stopPlayback)
         stopPlayback();