Nota — a free DAW for macOS, Windows and Linux. No subscription, no account — just open it and make music.
C# audioaudio-unitavaloniacpp20cross-platformdawdigital-audio-workstationdspjucelinux-audiomcp-servermidimusicmusic-productionpiano-rollplugin-hostsequencersynthesizervstvst3
(fix) Take retry: keep automation on devices an edit replaced with a copy
Egor Khindikaynenfd276a05f59b
diff --git a/src/native/nota.engine/src/engine/Engine_TakeRetry.cpp b/src/native/nota.engine/src/engine/Engine_TakeRetry.cppindex 7f03e638..98e5d2d2 100644--- a/src/native/nota.engine/src/engine/Engine_TakeRetry.cpp+++ b/src/native/nota.engine/src/engine/Engine_TakeRetry.cpp@@ -13,6 +13,8 @@#include <algorithm>#include <cmath>+#include <cstring>+#include <typeinfo>namespace nota {@@ -62,14 +64,48 @@ void Engine::closeTakeAttempt() {retryStartBeat_ = std::numeric_limits<double>::quiet_NaN();}-// The pre-take lanes of `base`, aimed at the devices as `cur` has them: a device moved during-// the take keeps its lanes (devices are shared between track copies, so the object finds its-// new slot), one removed takes its lanes with it — as remapAutomationAfterDeviceChange does.+// Where each device of `from` sits in `to` (-1: removed). The same object first — devices are+// shared between track copies, so a moved one is found in its new slot; then a device an edit+// replaced with a copy (a rack fork, a MIDI effect's loaded state) pairs with the unmatched+// device of the same type and name next in chain order.+template <class Chain>+static std::vector<int32_t> deviceMap(const Chain& from, const Chain& to) {+ std::vector<int32_t> map(from.size(), -1);+ std::vector<bool> taken(to.size(), false);+ for (size_t i = 0; i < from.size(); ++i)+ for (size_t j = 0; j < to.size(); ++j)+ if (!taken[j] && from[i] && from[i] == to[j]) {+ map[i] = static_cast<int32_t>(j);+ taken[j] = true;+ break;+ }+ auto same = [](const auto& x, const auto& y) {+ return x && y && typeid(*x) == typeid(*y) && std::strcmp(x->displayName(), y->displayName()) == 0;+ };+ size_t next = 0;+ for (size_t i = 0; i < from.size(); ++i) {+ if (map[i] >= 0) {+ next = std::max(next, static_cast<size_t>(map[i]) + 1);+ continue;+ }+ for (size_t j = next; j < to.size(); ++j)+ if (!taken[j] && same(from[i], to[j])) {+ map[i] = static_cast<int32_t>(j);+ taken[j] = true;+ next = j + 1;+ break;+ }+ }+ return map;+}++// The pre-take lanes of `base`, aimed at the devices where `cur` has them (deviceMap); a lane+// whose device was removed goes with it, as remapAutomationAfterDeviceChange does.static std::vector<TrackLane> lanesOnto(const Track& base, const Track& cur) {- auto slotIn = [](const auto& from, const auto& to, int32_t idx) -> int32_t {- if (idx < 0 || idx >= static_cast<int32_t>(from.size())) return -1;- auto it = std::find(to.begin(), to.end(), from[static_cast<size_t>(idx)]);- return it == to.end() ? -1 : static_cast<int32_t>(it - to.begin());+ const auto fx = deviceMap(base.devices, cur.devices);+ const auto mfx = deviceMap(base.midiEffects, cur.midiEffects);+ auto at = [](const std::vector<int32_t>& m, int32_t idx) {+ return idx >= 0 && idx < static_cast<int32_t>(m.size()) ? m[static_cast<size_t>(idx)] : -1;};std::vector<TrackLane> out;out.reserve(base.automation.size());@@ -80,11 +116,11 @@ static std::vector<TrackLane> lanesOnto(const Track& base, const Track& cur) {: l.target == AutomationTarget::DeviceParam ||(l.target == AutomationTarget::PluginParam && l.deviceIndex >= 0));if (midi) {- const int32_t ni = slotIn(base.midiEffects, cur.midiEffects, midiRack ? midiHostIndex(l.deviceIndex) : l.deviceIndex);+ const int32_t ni = at(mfx, midiRack ? midiHostIndex(l.deviceIndex) : l.deviceIndex);if (ni < 0) continue;l.deviceIndex = midiRack ? midiHost(ni) : ni;} else if (effect) {- const int32_t ni = slotIn(base.devices, cur.devices, l.deviceIndex);+ const int32_t ni = at(fx, l.deviceIndex);if (ni < 0) continue;l.deviceIndex = ni;}diff --git a/tests/Nota.SmokeTest/RetryTakeTests.cs b/tests/Nota.SmokeTest/RetryTakeTests.csindex 444ca79d..04781ca5 100644--- a/tests/Nota.SmokeTest/RetryTakeTests.cs+++ b/tests/Nota.SmokeTest/RetryTakeTests.cs@@ -35,6 +35,7 @@ internal static class RetryTakeTestsforeach (var r in EditsMadeMeanwhile()) yield return r;foreach (var r in RecordingTrackEditedMeanwhile()) yield return r;foreach (var r in DeviceMovedMeanwhile()) yield return r;+ foreach (var r in DeviceReplacedMeanwhile()) yield return r;foreach (var r in DisarmedTakeIsKept()) yield return r;foreach (var r in SessionHeldIntoRelaunch()) yield return r;foreach (var r in SessionToggleSlot()) yield return r;@@ -244,6 +245,36 @@ internal static class RetryTakeTestse.StopTransport();}+ // Edits that swap a device for a copy in its slot — renaming a MIDI Effect Rack's macro,+ // loading a MIDI effect's state — keep its automation through a retry.+ private static IEnumerable<(bool, string)> DeviceReplacedMeanwhile()+ {+ const int Arp = 0, MidiEffectRack = 6;+ using var e = Armed(out int t);+ int arp = e.AddMidiEffect(t, Arp);+ int rack = e.AddMidiEffect(t, MidiEffectRack);+ foreach (int d in new[] { arp, rack })+ {+ int l = e.AddAutomationLane(t, AutomationTarget.MidiDeviceParam, d, 0);+ e.SetAutomationPoints(t, l, new[] { new AutomationPoint(0, 0.2f), new AutomationPoint(4, 0.8f) });+ }+ e.SetCountIn(0);+ e.Seek(0.0);+ Beats(e, 0.01);+ e.SetRecording(true);+ Beats(e, 0.5);+ e.MidiRackSetMacroName(t, rack, 0, "Spread"); // forks the rack+ e.MidiEffectSetState(t, arp, e.MidiEffectGetState(t, arp), true); // copies the Arp+ e.RetryTake();+ Beats(e, 0.01);+ var on = Enumerable.Range(0, e.AutomationLaneCount(t)).Select(i => e.AutomationLaneInfo(t, i))+ .Where(i => i.Target == AutomationTarget.MidiDeviceParam && i.PointCount == 2).Select(i => i.DeviceIndex).OrderBy(x => x).ToArray();+ yield return (on.SequenceEqual(new[] { arp, rack }) && e.MidiRackMacroName(t, rack, 0) == "Spread",+ $"retry after editing a MIDI rack and loading an effect's state: their automation stays (lanes on {string.Join(",", on)})");+ e.SetRecording(false);+ e.StopTransport();+ }+// Disarming the track ends (and keeps) its take: a retry afterwards has nothing to discard.private static IEnumerable<(bool, string)> DisarmedTakeIsKept(){