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) Clicking a track no longer arms it: Auto-arm selected track is an option, off by default (#332) (#362)
Egor Khindikaynen0240fb9901f9
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 78c9de89..11dbe137 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -118,8 +118,9 @@ Entry categories: `Added`, `Changed`, `Fixed`, `Removed`.- **One click arms one track** (nota-daw/nota#332): a click on a track's arm button arms thattrack and disarms the others, so picking which instrument the keyboard plays is one click.⌘-click (Ctrl-click on Windows / Linux) arms several. While recording, a click never- disarms another track. Selecting an instrument track (a new one included) arms it the same- way, unless several tracks or an audio track are armed.+ disarms another track. With **Transport ▸ Auto-arm selected track** on (off by default),+ selecting an instrument track (a new one included) arms it the same way, unless several+ tracks or an audio track are armed.- **The Envelope Follower is easier to find** (nota-daw/nota#133): searching Modular's palettefor "peak controller", "ducking" or "loudness" finds it, and the docs walk through ducking onetrack under another.diff --git a/src/managed/Nota.App/MainWindow.Commands.cs b/src/managed/Nota.App/MainWindow.Commands.csindex e4963b55..976bd419 100644--- a/src/managed/Nota.App/MainWindow.Commands.cs+++ b/src/managed/Nota.App/MainWindow.Commands.cs@@ -95,6 +95,7 @@ public partial class MainWindowB("transport.playPause", () => _vm?.Transport.PlayPauseCommand.Execute(null));B("transport.stop", () => _vm?.Transport.StopCommand.Execute(null));B("transport.record", () => OnMenuRecord(this, e));+ B("transport.armOnSelect", ToggleArmOnSelect);B("transport.loop", () => OnMenuLoop(this, e));B("transport.metronome", () => OnMenuMetronome(this, e));B("transport.loopRecordMode", () => { if (_vm is not null) _vm.Transport.LoopRecordReplace = !_vm.Transport.LoopRecordReplace; });@@ -195,6 +196,23 @@ public partial class MainWindow: "Envelopes follow clips";}+ // Transport ▸ Auto-arm selected track (#332): arm-on-select, a saved preference, off by default.+ private void ToggleArmOnSelect()+ {+ if (_vm is null) return;+ bool on = !TrackArming.ArmOnSelect;+ SetArmOnSelect(on);+ _vm.Settings.Current.ArmOnSelect = on;+ _vm.Settings.Save();+ _vm.StatusText = on ? "Selecting an instrument track arms it" : "Selecting a track leaves the arms alone";+ }++ private void SetArmOnSelect(bool on)+ {+ TrackArming.ArmOnSelect = on;+ if (MenuItemFor("transport.armOnSelect") is { } mi) mi.IsChecked = on;+ }+// The grid shortcuts act on the clip editor (piano roll or audio — they share one setting)// when the detail area (docked or floating) was used last and one is open in it; otherwise// on the arrangement. An audio editor whose current view follows no grid (ADSR, or andiff --git a/src/managed/Nota.App/MainWindow.axaml b/src/managed/Nota.App/MainWindow.axamlindex 295a9683..034f43e9 100644--- a/src/managed/Nota.App/MainWindow.axaml+++ b/src/managed/Nota.App/MainWindow.axaml@@ -101,6 +101,7 @@<NativeMenuItem Header="Play / stop" app:Commands.Id="transport.playStop"/><NativeMenuItem Header="Play / pause" app:Commands.Id="transport.playPause"/><NativeMenuItem Header="Record" app:Commands.Id="transport.record"/>+ <NativeMenuItem Header="Auto-arm selected track" app:Commands.Id="transport.armOnSelect" ToggleType="CheckBox"/><NativeMenuItem Header="Loop" app:Commands.Id="transport.loop"/><NativeMenuItem Header="Loop record: overdub / replace" app:Commands.Id="transport.loopRecordMode"/><NativeMenuItem Header="Metronome" app:Commands.Id="transport.metronome"/>diff --git a/src/managed/Nota.App/MainWindow.axaml.cs b/src/managed/Nota.App/MainWindow.axaml.csindex d8507b3a..948c9dec 100644--- a/src/managed/Nota.App/MainWindow.axaml.cs+++ b/src/managed/Nota.App/MainWindow.axaml.cs@@ -384,6 +384,7 @@ public partial class MainWindow : WindowPianoRollView.AuditionToggled += OnAuditionToggled;vm.Transport.CountInBars = Math.Clamp(vm.Settings.Current.CountInBars, 0, 4);vm.Transport.LoopRecordReplace = vm.Settings.Current.LoopRecordReplace;+ SetArmOnSelect(vm.Settings.Current.ArmOnSelect);vm.Transport.PropertyChanged += (_, e) =>{// The loop record mode is an app preference: every switch (toggle, ⌘⇧R, menu, MCP) persists.diff --git a/src/managed/Nota.App/TrackArming.cs b/src/managed/Nota.App/TrackArming.csindex 66107c46..6324f190 100644--- a/src/managed/Nota.App/TrackArming.cs+++ b/src/managed/Nota.App/TrackArming.cs@@ -25,14 +25,18 @@ internal static class TrackArmingprivate static int _followed = -1;- /// <summary>The selection moved to <paramref name="trackId"/>: arm it if it's an- /// instrument track (see TrackArm.FollowSelection). Only a move to another track counts,- /// so a track disarmed by hand stays disarmed while you keep working on it.</summary>+ /// <summary>Arm-on-select is on (Transport ▸ Auto-arm selected track, a saved preference;+ /// off by default, so a click on a track leaves the arms alone).</summary>+ public static bool ArmOnSelect { get; set; }++ /// <summary>The selection moved to <paramref name="trackId"/>: with <see cref="ArmOnSelect"/>+ /// on, arm it if it's an instrument track (see TrackArm.FollowSelection). Only a move to+ /// another track counts, so a track disarmed by hand stays disarmed while you keep working on it.</summary>public static void FollowSelection(IAudioEngine engine, int trackId){if (trackId == _followed) return;_followed = trackId;- if (TrackArm.FollowSelection(engine, trackId)) OthersChanged?.Invoke();+ if (ArmOnSelect && TrackArm.FollowSelection(engine, trackId)) OthersChanged?.Invoke();}/// <summary>A new or reopened project reuses track ids: its first selection is a move.</summary>diff --git a/src/managed/Nota.Application/Palette/CommandCatalog.cs b/src/managed/Nota.Application/Palette/CommandCatalog.csindex 1f494960..8249fd51 100644--- a/src/managed/Nota.Application/Palette/CommandCatalog.cs+++ b/src/managed/Nota.Application/Palette/CommandCatalog.cs@@ -74,6 +74,7 @@ public static class CommandCatalogC("transport.playPause", "Play / pause", "Transport", Shortcut.Shift("Space"), "resume continue hold"),C("transport.stop", "Stop", "Transport", Shortcut.None("Return"), "halt"),C("transport.record", "Record", "Transport", Shortcut.Cmd('R'), "arm capture"),+ C("transport.armOnSelect", "Auto-arm selected track", "Transport", "", "arm on select follow selection record keyboard"),C("transport.loop", "Toggle loop", "Transport", Shortcut.Cmd('L'), "cycle repeat"),C("transport.metronome", "Metronome", "Transport", Shortcut.Cmd('M'), "click"),C("transport.loopRecordMode", "Loop record: overdub / replace", "Transport", Shortcut.CmdShift('R'), "overdub replace take pass loop record"),diff --git a/src/managed/Nota.Application/Settings.cs b/src/managed/Nota.Application/Settings.csindex 89b13f66..7e555e83 100644--- a/src/managed/Nota.Application/Settings.cs+++ b/src/managed/Nota.Application/Settings.cs@@ -160,6 +160,9 @@ public sealed class Settings/// <summary>Piano-roll note audition (#46): notes sound while they are placed, clicked or/// dragged. The speaker chip in the clip editor's header; on by default.</summary>public bool PianoRollAudition { get; set; } = true;+ /// <summary>Arm-on-select (#332): selecting an instrument track arms it alone, so the+ /// keyboard plays the track you're on. Transport ▸ Auto-arm selected track; off by default.</summary>+ public bool ArmOnSelect { get; set; }}public interface ISettingsServicediff --git a/src/managed/Nota.Presentation/TrackArm.cs b/src/managed/Nota.Presentation/TrackArm.csindex 2f5cdb21..fb0fa695 100644--- a/src/managed/Nota.Presentation/TrackArm.cs+++ b/src/managed/Nota.Presentation/TrackArm.cs@@ -4,8 +4,8 @@// Exclusive record-arm (#332): arming a track with a plain click arms that track alone, so// picking which instrument the keyboard plays is one click; the additive form (⌘-click, or// Ctrl-click on Windows / Linux) arms or disarms one track and leaves the others as they are.-// Selecting an instrument track arms it the same way, while the arms are still the one the-// selection picked.+// With arm-on-select on (Transport ▸ Auto-arm selected track, off by default), selecting an+// instrument track arms it the same way, while the arms are still the one the selection picked.using Nota.Application;