Reverted some legacy edit handling code that was creating false positives

Author: julianstorer

modules/tracktion_engine/model/edit/tracktion_Edit.cpp

@@ -811,96 +811,82 @@ void Edit::initialise (const Options& options)
     isLoadInProgress = true;
     tempDirectory = juce::File();
 
-    auto stateVersion = state[IDs::appVersion].toString();
-    bool isLegacy = stateVersion.isEmpty() || stateVersion.upToFirstOccurrenceOf (".", false, false).getIntValue() < 6;
+    if (! state.hasProperty (IDs::creationTime))
+        addValueTreeProperties (state,
+                                IDs::appVersion, engine.getPropertyStorage().getApplicationVersion(),
+                                IDs::creationTime, juce::Time::getCurrentTime().toMilliseconds());
+
+    lastSignificantChange.referTo (state, IDs::lastSignificantChange, nullptr,
+                                   juce::String::toHexString (juce::Time::getCurrentTime().toMilliseconds()));
+
+    globalMacros = std::make_unique<GlobalMacros> (*this);
+    initialiseTempoAndPitch();
+    initialiseTransport();
+    initialiseVideo();
+    initialiseClickTrack();
+    initialiseMasterVolume (options);
+    initialiseRacks();
+    initialiseMasterPlugins();
+    initialiseAudioDevices();
+    loadTracks();
 
-    auto init = [this, &options, isLegacy]
+    if (loadContext != nullptr)
     {
-        addValueTreeProperties (state, IDs::appVersion, engine.getPropertyStorage().getApplicationVersion());
-
-        if (! state.hasProperty (IDs::creationTime))
-            addValueTreeProperties (state, IDs::creationTime, juce::Time::getCurrentTime().toMilliseconds());
+        assert (loadContext->totalNumTracks == loadContext->numTracksLoaded);
+        loadContext->progress = 1.0f;
+    }
 
-        lastSignificantChange.referTo (state, IDs::lastSignificantChange, nullptr,
-                                    juce::String::toHexString (juce::Time::getCurrentTime().toMilliseconds()));
+    initialiseTracks (options);
+    initialiseARA();
+    updateMuteSoloStatuses();
+    readFrozenTracksFiles();
 
-        globalMacros = std::make_unique<GlobalMacros> (*this);
-        initialiseTempoAndPitch();
-        initialiseTransport();
-        initialiseVideo();
-        initialiseClickTrack();
-        initialiseMasterVolume (options);
-        initialiseRacks();
-        initialiseMasterPlugins();
-        initialiseAudioDevices();
-        loadTracks();
+    getLength(); // forcibly update the length before the isLoadInProgress is disabled.
 
-        if (loadContext != nullptr)
-        {
-            assert (loadContext->totalNumTracks == loadContext->numTracksLoaded || isLegacy);
-            (void) isLegacy;
-            loadContext->progress = 1.0f;
-        }
+    for (auto t : getAllTracks (*this))
+        t->cancelAnyPendingUpdates();
 
-        initialiseTracks (options);
-        initialiseARA();
-        updateMuteSoloStatuses();
-        readFrozenTracksFiles();
+    initialiseControllerMappings();
 
-        getLength(); // forcibly update the length before the isLoadInProgress is disabled.
+    callBlocking ([this]
+                  {
+                      TemporaryFileManager::purgeOrphanFreezeAndProxyFiles (*this);
 
-        for (auto t : getAllTracks (*this))
-            t->cancelAnyPendingUpdates();
+                      // Must be set to false before curve updates
+                      // but set inside here to give the message loop some time to dispatch async updates
+                      isLoadInProgress = false;
+                      auto cursorPos = getTransport().getPosition();
 
-        initialiseControllerMappings();
+                      for (auto mpl : getAllMacroParameterLists (*this))
+                          for (auto mp : mpl->getMacroParameters())
+                              mp->initialise();
 
-        callBlocking ([this]
-        {
-            TemporaryFileManager::purgeOrphanFreezeAndProxyFiles (*this);
+                      for (auto ap : getAllAutomatableParams (true))
+                      {
+                          ap->updateStream();
 
-            // Must be set to false before curve updates
-            // but set inside here to give the message loop some time to dispatch async updates
-            isLoadInProgress = false;
-            auto cursorPos = getTransport().getPosition();
+                          if (ap->isAutomationActive())
+                              ap->updateFromAutomationSources (cursorPos);
+                      }
 
-            for (auto mpl : getAllMacroParameterLists (*this))
-                for (auto mp : mpl->getMacroParameters())
-                    mp->initialise();
+                      for (auto effect : getAllClipEffects (*this))
+                          effect->initialise();
+                  });
 
-            for (auto ap : getAllAutomatableParams (true))
-            {
-                ap->updateStream();
+    cancelAnyPendingUpdates();
 
-                if (ap->isAutomationActive())
-                    ap->updateFromAutomationSources (cursorPos);
-            }
+    // reset the change status asynchronously to take into account deferred updates
+    changeResetterTimer = std::make_unique<EditChangeResetterTimer> (*this);
 
-            for (auto effect : getAllClipEffects (*this))
-                effect->initialise();
-        });
-
-        cancelAnyPendingUpdates();
-
-        // reset the change status asynchronously to take into account deferred updates
-        changeResetterTimer = std::make_unique<EditChangeResetterTimer> (*this);
-
-       #if TRACKTION_ENABLE_AUTOMAP && TRACKTION_ENABLE_CONTROL_SURFACES
-        if (shouldPlay())
-            if (auto na = engine.getExternalControllerManager().getAutomap())
-                na->load (*this);
-       #endif
-
-        auxBusses = state.getChildWithName ("AUXBUSNAMES");
+   #if TRACKTION_ENABLE_AUTOMAP && TRACKTION_ENABLE_CONTROL_SURFACES
+    if (shouldPlay())
+        if (auto na = engine.getExternalControllerManager().getAutomap())
+            na->load (*this);
+   #endif
 
-        getUndoManager().clearUndoHistory();
-    };
+    auxBusses = state.getChildWithName ("AUXBUSNAMES");
 
-    /// When loading a legacy edit, we need to do it all on the message thread, because
-    /// it causes all kinds of indirect updates to values.
-    if (isLegacy)
-        callBlocking ([&] { init(); });
-    else
-        init();
+    getUndoManager().clearUndoHistory();
 
     DBG ("Edit loaded in: " << loadTimer.getDescription());
 }