Plugins: Fixed some subtle initialisation order problems

Author: drowaudio

modules/tracktion_engine/model/automation/tracktion_AutomatableEditItem.cpp

@@ -16,12 +16,15 @@ AutomatableEditItem::AutomatableEditItem (Edit& ed, const juce::ValueTree& v)
       elementState (v)
 {
     remapOnTempoChange.referTo (elementState, IDs::remapOnTempoChange, &edit.getUndoManager(), false);
-    edit.automatableEditItemCache.addItem (*this);
+
+    if (itemID.isValid())
+        edit.automatableEditItemCache.addItem (*this);
 }
 
 AutomatableEditItem::~AutomatableEditItem()
 {
-    edit.automatableEditItemCache.removeItem (*this);
+    if (itemID.isValid())
+        edit.automatableEditItemCache.removeItem (*this);
 }
 
 //==============================================================================

modules/tracktion_engine/model/automation/tracktion_AutomatableParameter.cpp

@@ -653,19 +653,22 @@ struct AutomatableParameter::AutomationSourceList  : private ValueTreeObjectList
 
         if (! getUndoManager (parameter).isPerformingUndoRedo())
             removeInvalidAutomationCurveModifiers (parent, parameter);
+    }
+
+    ~AutomationSourceList() override
+    {
+        freeObjects();
+    }
 
+    void initialise()
+    {
         rebuildObjects();
         updateCachedSources();
 
         if (isActive())
             parameter.curveSource->triggerAsyncIteratorUpdate();
     }
 
-    ~AutomationSourceList() override
-    {
-        freeObjects();
-    }
-
     static bool hasAutomationSources (const juce::ValueTree& stateToCheck)
     {
         for (auto v : stateToCheck)
@@ -1055,6 +1058,10 @@ AutomatableParameter::ModifierAssignment::Ptr AutomatableParameter::addModifier
     }
     else if (auto macro = dynamic_cast<MacroParameter*> (&source))
     {
+        // Can't assign a MacroParameter to itself
+        if (macro == this)
+            return {};
+
         v = createValueTree (IDs::MACRO,
                              IDs::source, macro->paramID);
     }
@@ -1508,7 +1515,10 @@ void AutomatableParameter::startRecordingStatus()
 AutomatableParameter::AutomationSourceList& AutomatableParameter::getAutomationSourceList() const
 {
     if (! automationSourceList)
+    {
         automationSourceList = std::make_unique<AutomationSourceList> (*this);
+        automationSourceList->initialise();
+    }
 
     return *automationSourceList;
 }

modules/tracktion_engine/model/edit/tracktion_Edit.cpp

@@ -871,6 +871,9 @@ void Edit::initialise (const Options& options)
 
                       for (auto effect : getAllClipEffects (*this))
                           effect->initialise();
+
+                      for (auto p : getAllPlugins (*this, true))
+                          p->trackPropertiesChanged();
                   });
 
     cancelAnyPendingUpdates();

modules/tracktion_engine/model/tracks/tracktion_TrackUtils.cpp

@@ -212,6 +212,8 @@ void TrackList::deleteObject (Track* t)
 
 void TrackList::newObjectAdded (Track* t)
 {
+    jassert (t != nullptr);
+
     if (edit.isLoading())
         return;
 

modules/tracktion_engine/plugins/external/tracktion_ExternalPlugin.cpp

@@ -951,15 +951,13 @@ void ExternalPlugin::doFullInitialisation()
 
 void ExternalPlugin::trackPropertiesChanged()
 {
-    juce::MessageManager::callAsync ([this, pluginRef = makeSafeRef (*this)]
-    {
-        if (pluginRef == nullptr)
-            return;
+    if (edit.isLoading())
+        return;
 
-        if (auto t = getOwnerTrack(); t != nullptr)
-            if (auto pi = getAudioPluginInstance())
-                pi->updateTrackProperties ({ t->getName(), t->getColour() });
-    });
+    TRACKTION_ASSERT_MESSAGE_THREAD
+    if (auto t = getOwnerTrack(); t != nullptr)
+        if (auto pi = getAudioPluginInstance())
+            pi->updateTrackProperties ({ t->getName(), t->getColour() });
 }
 
 //==============================================================================