@pro-gram/flux 1.6.2 → 1.6.4

package/source/EditorView.cs

@@ -110,6 +110,7 @@ namespace DrumBuddy
             var editing = new WrapPanel(); tools.Children.Add(editing);
             recordButton = WorkspaceUi.Button("Record", delegate { if (RecordRequested != null) RecordRequested(); }); recordButton.Background = WorkspaceUi.Color("#B52C36"); recordButton.Foreground = System.Windows.Media.Brushes.White; editing.Children.Add(recordButton);
             recordButton.SetResourceReference(Control.ForegroundProperty, "ThemeOnAccent");
+            editing.Children.Add(WorkspaceUi.Button("Mixer", delegate { ToggleMixer(); }));
             editing.Children.Add(WorkspaceUi.Button("Record options", delegate { ShowRecordingOptions(!recordingPane.IsPaneVisible); }));
             undoButton = WorkspaceUi.Button("Undo", delegate { Undo(false); }); editing.Children.Add(undoButton);
             redoButton = WorkspaceUi.Button("Redo", delegate { Undo(true); }); editing.Children.Add(redoButton);
@@ -205,8 +206,9 @@ namespace DrumBuddy
             transport.Children.Add(WorkspaceUi.Button("Stop", delegate { if (recording && StopRequested != null) StopRequested(); else { Stop(); UpdateTransport(); } }));
             transport.Children.Add(WorkspaceUi.Button("To start", delegate { if (IsBusy) return; Stop(); playhead = 0; DrawCanvas(); EnsurePlayheadVisible(); }));
             positionText = WorkspaceUi.Text("00:00.00 / 00:00.00", 16); positionText.FontFamily = new FontFamily("Consolas"); positionText.Margin = new Thickness(0, 0, 14, 8); transport.Children.Add(positionText);
-            transport.Children.Add(WorkspaceUi.Text("Listen volume  ", 14));
+            transport.Children.Add(WorkspaceUi.Text("Monitor volume  ", 14));
             volume = new Slider { Minimum = 0, Maximum = 100, Value = 75, Width = 120, Margin = new Thickness(0, 0, 16, 8), VerticalAlignment = VerticalAlignment.Center };
+            volume.ToolTip = "Listening volume only. Mixer track and master faders also affect exported audio.";
             volume.ValueChanged += delegate { output.Volume((float)(volume.Value / 100)); }; transport.Children.Add(volume);
             outputPicker = new AudioOutputPicker(delegate { Stop(); }, status); bottom.Children.Add(outputPicker);
             var exports = new WrapPanel(); bottom.Children.Add(exports);
@@ -218,10 +220,11 @@ namespace DrumBuddy
             AddFileButton(exports, "Export mix…", async delegate { await ExportMix(); });
             ArrangeCompactChrome(top, editing, range, viewControls, zoomTools, bottom, transport, exports);
             timer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(80) };
-            timer.Tick += delegate { if (output.Playing || output.Paused) { playhead = (long)Math.Round(output.Position * Audio.Rate); UpdateTransport(); UpdatePlayLine(); if (output.Playing && DateTime.UtcNow >= manualViewUntil) EnsurePlayheadVisible(); } }; timer.Start();
+            timer.Tick += delegate { if (output.Playing || output.Paused) { playhead = (long)Math.Round(output.Position * Audio.Rate); UpdateTransport(); UpdatePlayLine(); if (output.Playing && DateTime.UtcNow >= manualViewUntil) EnsurePlayheadVisible(); } TickMixerMeters(); }; timer.Start();
             waveformDetail = new WaveformDetail(Dispatcher, delegate { if (!disposed) DrawCanvas(); });
             UpdateSelectionText(); BuildHeaders(); DrawCanvas();
-            recordingPane = new DockablePane(editorBody, null, "Record options", false, false, 260) { MinimumMainHeight = 300 }; Children.Add(recordingPane);
+            mixerPane = new DockablePane(editorBody, CreateMixer(), "Mixer", true, false, 360) { MinimumMainHeight = 220 };
+            recordingPane = new DockablePane(mixerPane, null, "Record options", false, false, 260) { MinimumMainHeight = 300 }; Children.Add(recordingPane);
             editorBody.SizeChanged += delegate { UpdateCompactLayout(); };
         }
 
@@ -418,18 +421,19 @@ namespace DrumBuddy
                 if (RecordingTrack(i)) name.Foreground = WorkspaceUi.Color("#B52C36");
                 var strip = new StackPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(0, 3, 0, 0) }; panel.Children.Add(strip);
                 var mute = new ToggleButton { Content = "M", IsChecked = state.Mute, Width = 28, Height = 26, FontSize = 12, Margin = new Thickness(0, 0, 4, 0), ToolTip = "Mute track " + (i + 1) };
-                mute.Click += delegate { if (!updating) Change(delegate { session.Tracks[index].Mute = mute.IsChecked == true; return true; }, "Track mute changed."); }; strip.Children.Add(mute);
+                mute.Click += delegate { if (!updating) SetMixerMute(index, mute.IsChecked == true); }; strip.Children.Add(mute); headerMutes[i] = mute;
                 var solo = new ToggleButton { Content = "S", IsChecked = state.Solo, Width = 28, Height = 26, FontSize = 12, Margin = new Thickness(0, 0, 6, 0), ToolTip = "Solo track " + (i + 1) };
-                solo.Click += delegate { if (!updating) Change(delegate { session.Tracks[index].Solo = solo.IsChecked == true; return true; }, "Track solo changed."); }; strip.Children.Add(solo);
-                var levels = new[] { -60.0, -24, -18, -12, -6, 0, 3, 6, 12, state.GainDb }.Distinct().OrderBy(v => v).ToArray();
+                solo.Click += delegate { if (!updating) SetMixerSolo(index, solo.IsChecked == true); }; strip.Children.Add(solo); headerSolos[i] = solo;
+                var levels = new[] { -60.0, -24, -18, -12, -6, 0, 3, 6, 12, 18, 24, state.GainDb }.Distinct().OrderBy(v => v).ToArray();
                 var level = new ComboBox { ItemsSource = levels.Select(v => v.ToString("0.#", CultureInfo.InvariantCulture) + " dB").ToArray(), SelectedIndex = Array.IndexOf(levels, state.GainDb), Width = 102, MinHeight = 26, Height = 26, FontSize = 12, Padding = new Thickness(3, 0, 3, 0), ToolTip = "Track playback / export level" };
-                level.SelectionChanged += delegate { if (!updating && level.SelectedIndex >= 0) { double value = levels[level.SelectedIndex]; Change(delegate { session.Tracks[index].GainDb = value; return true; }, "Track level changed."); } }; strip.Children.Add(level);
+                level.SelectionChanged += delegate { if (!updating && level.SelectedItem != null) { double value; if (TempoGrid.TryTempo(level.SelectedItem.ToString().Replace(" dB", ""), out value)) SetMixerGain(index, value); } }; strip.Children.Add(level); headerLevels[i] = level;
                 var border = new Border { Height = RowHeight, BorderThickness = new Thickness(RecordingTrack(i) ? 3 : 0, 0, 1, 1), BorderBrush = WorkspaceUi.Color(RecordingTrack(i) ? "#B52C36" : "#D6E1DF"), Background = WorkspaceUi.Color(i == track ? "#DCEFEB" : "#EDF3F1"), Child = panel };
                 border.PreviewMouseLeftButtonDown += delegate { if (!IsBusy && track != index) { track = index; UpdateSelectionText(); } };
                 border.MouseLeftButtonUp += delegate { BuildHeaders(); DrawCanvas(); };
                 headers.Children.Add(border);
             }
             updating = false;
+            RefreshMixerControls();
         }
         private void DrawCanvas()
         {
@@ -458,6 +462,7 @@ namespace DrumBuddy
             playLine.Y1 = 0; playLine.Y2 = timeline.Height; timeline.Children.Add(playLine); UpdatePlayLine(); UpdateTransport();
             undoButton.IsEnabled = !IsBusy && undo.Count > 0; redoButton.IsEnabled = !IsBusy && redo.Count > 0;
             title.Text = session.Name + (dirty ? " *" : "");
+            RefreshMixerControls();
         }
         private void UpdateSelectionOverlay()
         {
@@ -526,7 +531,7 @@ namespace DrumBuddy
 
         private void Change(Func<bool> action, string message)
         {
-            if (IsBusy) return; Stop(); var before = session.Copy();
+            if (IsBusy) return; FinishMixerGesture(); Stop(); var before = session.Copy();
             var oldIds = selectedIds.ToArray(); bool oldMode = clipSelection; long oldFrom = from, oldTo = to; int oldTrack = track;
             Action restore = delegate { session = before; selectedIds.Clear(); foreach (string id in oldIds) selectedIds.Add(id); clipSelection = oldMode; from = oldFrom; to = oldTo; track = oldTrack; UpdateSelectionText(); BuildHeaders(); DrawCanvas(); };
             try {
@@ -538,7 +543,7 @@ namespace DrumBuddy
         private void Undo(bool forward)
         {
             if (IsBusy) return; var source = forward ? redo : undo; var target = forward ? undo : redo;
-            if (source.Count == 0) return; Stop(); target.Push(session.Copy()); session = source.Pop(); dirty = true; RefreshClipBounds(); BuildHeaders(); DrawCanvas();
+            if (source.Count == 0) return; FinishMixerGesture(); Stop(); target.Push(session.Copy()); session = source.Pop(); dirty = true; RefreshClipBounds(); BuildHeaders(); DrawCanvas();
         }
         private void Split() { Change(() => TimelineEdits.Split(session, track, AllTracks, playhead, clipSelection ? selectedIds : null), "Split at the playhead."); }
         private void Copy(bool cut)
@@ -597,16 +602,16 @@ namespace DrumBuddy
             finally { EndWork(); BuildHeaders(); DrawCanvas(); timeline.Focus(); }
         }
         private void BeginWork()
-        { operation = new CancellationTokenSource(); foreach (var button in fileButtons) button.IsEnabled = false; play.IsEnabled = false; cancel.Visibility = Visibility.Visible; RefreshGridToolbar(); }
+        { operation = new CancellationTokenSource(); FinishMixerGesture(); foreach (var button in fileButtons) button.IsEnabled = false; play.IsEnabled = false; cancel.Visibility = Visibility.Visible; RefreshGridToolbar(); RefreshMixerControls(); }
         private void EndWork()
-        { operation.Dispose(); operation = null; foreach (var button in fileButtons) button.IsEnabled = true; play.IsEnabled = true; cancel.Visibility = Visibility.Collapsed; RefreshGridToolbar(); }
+        { operation.Dispose(); operation = null; foreach (var button in fileButtons) button.IsEnabled = true; play.IsEnabled = true; cancel.Visibility = Visibility.Collapsed; RefreshGridToolbar(); RefreshMixerControls(); }
         private void NewSession()
         {
-            if (IsBusy || !ConfirmClose()) return; Stop(); session = new EditorSession { Grid = InterfacePreferences.Current.Grid.Copy() }; sessionPath = null; assets.Clear(); undo.Clear(); redo.Clear(); dirty = false; selectedIds.Clear(); clipSelection = false; from = to = playhead = 0; UpdateSelectionText(); BuildHeaders(); DrawCanvas();
+            if (IsBusy || !ConfirmClose()) return; FinishMixerGesture(); Stop(); session = new EditorSession { Grid = InterfacePreferences.Current.Grid.Copy() }; ResetMixerMeters(); sessionPath = null; assets.Clear(); undo.Clear(); redo.Clear(); dirty = false; selectedIds.Clear(); clipSelection = false; from = to = playhead = 0; UpdateSelectionText(); BuildHeaders(); DrawCanvas();
         }
         public bool SaveSession(bool saveAs)
         {
-            if (IsBusy) return false;
+            if (IsBusy) return false; FinishMixerGesture();
             string path = sessionPath;
             if (saveAs || string.IsNullOrEmpty(path)) {
                 var dialog = new Microsoft.Win32.SaveFileDialog { Title = "Save the editor session", Filter = "Flux editor session|*.dbedit", DefaultExt = ".dbedit", FileName = session.Name == "Untitled session" ? "Practice.dbedit" : session.Name + ".dbedit" };
@@ -630,7 +635,7 @@ namespace DrumBuddy
                     decoded.Add(path, clip);
                 }
                 using (var verify = new TimelineMix(loaded, decoded)) { }
-                operation.Token.ThrowIfCancellationRequested(); session = loaded; assets.Clear(); foreach (var pair in decoded) assets.Add(pair.Key, pair.Value);
+                operation.Token.ThrowIfCancellationRequested(); session = loaded; ResetMixerMeters(); assets.Clear(); foreach (var pair in decoded) assets.Add(pair.Key, pair.Value);
                 sessionPath = dialog.FileName; undo.Clear(); redo.Clear(); dirty = false; selectedIds.Clear(); clipSelection = false; from = to = playhead = 0; UpdateSelectionText(); status("Editor session opened.");
             }
             catch (OperationCanceledException) { status("Opening cancelled. Your current timeline is kept."); }
@@ -674,6 +679,15 @@ namespace DrumBuddy
             if (output.Playing || output.Paused) playhead = (long)Math.Round(output.Position * Audio.Rate);
             output.Stop(); if (mix != null) { mix.Dispose(); mix = null; } play.Content = "Play";
         }
+        private void JumpBar(int direction)
+        {
+            if (!CommitTempo()) return;
+            bool playing = output.Playing, paused = output.Paused;
+            Stop(); playhead = TempoGrid.AdjacentBar(playhead, session.Grid, direction);
+            DrawCanvas(); EnsurePlayheadVisible();
+            if (playing && playhead < session.End) PlayPause();
+            else if (paused) play.Content = "Resume";
+        }
         public void AttachRecordingPanel(FrameworkElement panel)
         {
             panel.Margin = new Thickness(10); recordingPane.SetContent(panel);
@@ -690,9 +704,10 @@ namespace DrumBuddy
         {
             recording = active; recordButton.Content = active ? "Stop recording" : "Record"; recordButton.IsEnabled = true; play.IsEnabled = !active;
             playLine.Stroke = WorkspaceUi.Color(active ? "#B52C36" : "#D0772C");
+            FinishMixerGesture(); RefreshMixerControls();
             RefreshGridToolbar();
             foreach (var button in fileButtons) button.IsEnabled = !active && operation == null;
-            if (active) { Stop(); ShowRecordingOptions(true); }
+            if (active) { Stop(); ResetMixerMeters(); UpdateRecordingInputMeters(new float[8]); ShowRecordingOptions(true); }
             else { recordingPlan = null; captureRunning = false; recordingBanner.Visibility = Visibility.Collapsed; BuildHeaders(); DrawCanvas(); }
         }
         public async Task AddRecordedFiles(IEnumerable<string> paths, long at, int firstTrack, bool keepPlayhead = false)
@@ -719,10 +734,11 @@ namespace DrumBuddy
         public async Task<bool> ExecuteAction(string action)
         {
             if (action == "selectTool" && clipDrag != ClipDrag.None) CancelClipDrag();
-            if (IsBusy && action != "stop" && !action.StartsWith("zoom", StringComparison.Ordinal)) return false;
+            if (IsBusy && action != "stop" && action != "mixer" && !action.StartsWith("zoom", StringComparison.Ordinal)) return false;
             if (ExecuteClipAction(action)) return true;
             switch (action) {
                 case "play": PlayPause(); break;
+                case "mixer": ToggleMixer(); break;
                 case "stop": Stop(); UpdateTransport(); break;
                 case "split": Split(); break;
                 case "selectTool": SetPointerTool("select"); break;
@@ -739,7 +755,9 @@ namespace DrumBuddy
                 case "new": NewSession(); break;
                 case "import": await ChooseAudio(); break;
                 case "export": await ExportMix(); break;
-                case "start": Stop(); playhead = 0; DrawCanvas(); EnsurePlayheadVisible(); break;
+                case "start": case "startAlternate": Stop(); playhead = 0; DrawCanvas(); EnsurePlayheadVisible(); break;
+                case "previousBar": JumpBar(-1); break;
+                case "nextBar": JumpBar(1); break;
                 case "end": Stop(); playhead = session.End; DrawCanvas(); EnsurePlayheadVisible(); break;
                 case "zoomIn": case "zoomInPlus": case "zoomInKeypad": ZoomStep(2); break;
                 case "zoomOut": case "zoomOutKeypad": ZoomStep(.5); break;
@@ -768,7 +786,7 @@ namespace DrumBuddy
             return choice == MessageBoxResult.No || (choice == MessageBoxResult.Yes && SaveSession(false));
         }
         internal void SetForTest(EditorSession state, IDictionary<string, Clip> decoded)
-        { session = state.Copy(); assets.Clear(); foreach (var p in decoded) assets.Add(p.Key, p.Value); undo.Clear(); redo.Clear(); dirty = false; selectedIds.Clear(); clipSelection = false; from = to = playhead = 0; UpdateSelectionText(); BuildHeaders(); DrawCanvas(); }
+        { session = state.Copy(); ResetMixerMeters(); assets.Clear(); foreach (var p in decoded) assets.Add(p.Key, p.Value); undo.Clear(); redo.Clear(); dirty = false; selectedIds.Clear(); clipSelection = false; from = to = playhead = 0; UpdateSelectionText(); BuildHeaders(); DrawCanvas(); }
         internal EditorSession SessionForTest { get { return session.Copy(); } }
         internal void ListenVolumeForTest(double value) { volume.Value = value; }
         internal bool PlayingForTest { get { return output.Playing; } }

package/source/InterfaceSettings.cs

@@ -29,7 +29,7 @@ namespace DrumBuddy
                 if ((mods & ModifierKeys.Alt) != 0) text += "Alt+";
                 if ((mods & ModifierKeys.Shift) != 0) text += "Shift+";
                 if ((mods & ModifierKeys.Windows) != 0) text += "Win+";
-                return text + (Key == "Back" ? "Backspace" : Key == "OemComma" ? "," : Key == "OemPlus" ? "=" : Key == "OemMinus" ? "-" : Key.StartsWith("D") && Key.Length == 2 && char.IsDigit(Key[1]) ? Key.Substring(1) : Key);
+                return text + (Key == "Return" || Key == "Enter" ? "Enter" : Key == "Back" ? "Backspace" : Key == "OemComma" ? "," : Key == "OemPlus" ? "=" : Key == "OemMinus" ? "-" : Key.StartsWith("D") && Key.Length == 2 && char.IsDigit(Key[1]) ? Key.Substring(1) : Key);
             }
         }
     }
@@ -60,6 +60,8 @@ namespace DrumBuddy
             { "undo", "Undo" }, { "redo", "Redo" }, { "save", "Save session" }, { "saveAs", "Save session as" },
             { "open", "Open session" }, { "new", "New session" }, { "import", "Import audio" }, { "export", "Export mix" },
             { "start", "Go to start" }, { "end", "Go to end" }, { "home", "Open Home" }, { "editor", "Open Editor" },
+            { "startAlternate", "Go to start (alternate)" }, { "previousBar", "Go to previous bar" }, { "nextBar", "Go to next bar" },
+            { "mixer", "Show / hide Editor mixer" },
             { "converter", "Open Converter" }, { "player", "Open Media Player" }, { "settings", "Open Settings" }
             , { "timelineSettings", "Open Timeline settings" }, { "zoomIn", "Editor zoom in" }, { "zoomInPlus", "Editor zoom in (+ key)" }, { "zoomInKeypad", "Editor zoom in (keypad)" }, { "zoomOut", "Editor zoom out" }, { "zoomOutKeypad", "Editor zoom out (keypad)" }, { "zoomFit", "Fit project in Editor" }, { "zoomSelection", "Fit selection in Editor" }
         };
@@ -69,6 +71,8 @@ namespace DrumBuddy
             string[] simple = { "play:Space", "stop:Space:Shift", "record:R", "split:S", "scissors:None", "copy:C:Control", "cut:X:Control", "paste:V:Control", "delete:Back", "deleteAlternate:Delete", "undo:Z:Control", "redo:Y:Control", "save:S:Control", "saveAs:S:Control,Shift", "open:O:Control", "new:N:Control", "import:I:Control", "export:E:Control", "start:Home", "end:End", "home:D1:Control", "editor:D2:Control", "converter:D3:Control", "player:D4:Control", "settings:OemComma:Control", "timelineSettings:None" };
             simple = simple.Concat(new[] { "selectTool:V", "zoomIn:OemPlus:Control", "zoomInPlus:OemPlus:Control,Shift", "zoomInKeypad:Add:Control", "zoomOut:OemMinus:Control", "zoomOutKeypad:Subtract:Control", "zoomFit:D0:Control", "zoomSelection:D0:Control,Shift" }).ToArray();
             simple = simple.Concat(new[] { "slipTool:Y", "fadeTool:F", "duplicate:D:Control", "repeatClips:L:Control", "muteClips:M", "crossfade:X", "clearFades:None" }).ToArray();
+            simple = simple.Concat(new[] { "startAlternate:Return", "previousBar:Left:Control", "nextBar:Right:Control" }).ToArray();
+            simple = simple.Concat(new[] { "mixer:None" }).ToArray();
             foreach (string text in simple) {
                 string[] parts = text.Split(':');
                 settings.Keybinds.Add(new ShortcutBinding { Action = parts[0], Key = parts[1], Modifiers = parts.Length > 2 ? (int)(ModifierKeys)Enum.Parse(typeof(ModifierKeys), parts[2]) : 0 });
@@ -99,7 +103,7 @@ namespace DrumBuddy
                 Key key;
                 if (string.IsNullOrEmpty(binding.Key) || binding.Key == "None") continue;
                 if (!Enum.TryParse<Key>(binding.Key, out key) || IsModifier(key) || binding.Modifiers < 0 || binding.Modifiers > 15) throw new IOException("Invalid shortcut for " + Actions[binding.Action] + ".");
-                string signature = binding.Key + ":" + binding.Modifiers;
+                string signature = (int)key + ":" + binding.Modifiers;
                 if (used.ContainsKey(signature)) throw new IOException(binding.Gesture + " is assigned to both " + Actions[used[signature]] + " and " + Actions[binding.Action] + ". Change or clear one binding.");
                 used[signature] = binding.Action;
             }
@@ -115,7 +119,8 @@ namespace DrumBuddy
                 settings.KeymapRevision = 1;
             }
             foreach (var binding in Defaults().Keybinds) if (!settings.Keybinds.Any(b => b.Action == binding.Action)) {
-                if (settings.Keybinds.Any(b => b.Key == binding.Key && b.Modifiers == binding.Modifiers)) { binding.Key = "None"; binding.Modifiers = 0; }
+                Key defaultKey = (Key)Enum.Parse(typeof(Key), binding.Key);
+                if (settings.Keybinds.Any(b => SameKey(b.Key, defaultKey) && b.Modifiers == binding.Modifiers)) { binding.Key = "None"; binding.Modifiers = 0; }
                 settings.Keybinds.Add(binding);
             }
         }
@@ -137,9 +142,11 @@ namespace DrumBuddy
         }
         public static bool IsModifier(Key key)
         { return key == Key.LeftCtrl || key == Key.RightCtrl || key == Key.LeftAlt || key == Key.RightAlt || key == Key.LeftShift || key == Key.RightShift || key == Key.LWin || key == Key.RWin || key == Key.None; }
+        private static bool SameKey(string name, Key key)
+        { Key parsed; return Enum.TryParse<Key>(name, out parsed) && parsed == key; }
         public static string Resolve(Key key, ModifierKeys modifiers)
         {
-            var binding = Current.Keybinds.FirstOrDefault(b => b.Key == key.ToString() && b.Modifiers == (int)modifiers);
+            var binding = Current.Keybinds.FirstOrDefault(b => SameKey(b.Key, key) && b.Modifiers == (int)modifiers);
             return binding == null ? null : binding.Action;
         }
         public static string Gesture(string action)

package/source/Main.cs

@@ -20,7 +20,7 @@ using NAudio.Wave.SampleProviders;
 
 [assembly: AssemblyTitle("Flux")]
 [assembly: AssemblyDescription("PCM/float media player, 16-track audio editor, H5studio recording and R16 control")]
-[assembly: AssemblyVersion("1.6.2.0")]
+[assembly: AssemblyVersion("1.6.4.0")]
 
 namespace DrumBuddy
 {
@@ -444,7 +444,7 @@ namespace DrumBuddy
         }
         private void BindMenus()
         {
-            string[,] entries = { { "FileNew", "new" }, { "FileOpen", "open" }, { "FileSave", "save" }, { "FileSaveAs", "saveAs" }, { "FileImport", "import" }, { "FileExport", "export" }, { "ViewHome", "home" }, { "ViewEditor", "editor" }, { "ViewConverter", "converter" }, { "ViewPlayer", "player" }, { "ViewControl", "control" }, { "ViewRecording", "recordOptions" }, { "SettingsGeneral", "settings" }, { "SettingsTimeline", "timelineSettings" }, { "SettingsAudio", "audio" }, { "SettingsKeys", "keybinds" } };
+            string[,] entries = { { "FileNew", "new" }, { "FileOpen", "open" }, { "FileSave", "save" }, { "FileSaveAs", "saveAs" }, { "FileImport", "import" }, { "FileExport", "export" }, { "ViewHome", "home" }, { "ViewEditor", "editor" }, { "ViewConverter", "converter" }, { "ViewPlayer", "player" }, { "ViewControl", "control" }, { "ViewRecording", "recordOptions" }, { "ViewMixer", "mixer" }, { "SettingsGeneral", "settings" }, { "SettingsTimeline", "timelineSettings" }, { "SettingsAudio", "audio" }, { "SettingsKeys", "keybinds" } };
             for (int i = 0; i < entries.GetLength(0); i++) { string action = entries[i, 1]; C<MenuItem>(entries[i, 0]).Click += async delegate { await ExecuteInterfaceAction(action); }; }
             C<MenuItem>("FileExit").Click += delegate { window.Close(); };
             C<MenuItem>("InstallAudioDrivers").Click += delegate { DriverSetup.ShowGuide(window); };
@@ -453,7 +453,7 @@ namespace DrumBuddy
         }
         private void RefreshMenuGestures()
         {
-            string[,] entries = { { "FileNew", "new" }, { "FileOpen", "open" }, { "FileSave", "save" }, { "FileSaveAs", "saveAs" }, { "FileImport", "import" }, { "FileExport", "export" }, { "ViewHome", "home" }, { "ViewEditor", "editor" }, { "ViewConverter", "converter" }, { "ViewPlayer", "player" }, { "SettingsGeneral", "settings" } };
+            string[,] entries = { { "FileNew", "new" }, { "FileOpen", "open" }, { "FileSave", "save" }, { "FileSaveAs", "saveAs" }, { "FileImport", "import" }, { "FileExport", "export" }, { "ViewHome", "home" }, { "ViewEditor", "editor" }, { "ViewConverter", "converter" }, { "ViewPlayer", "player" }, { "ViewMixer", "mixer" }, { "SettingsGeneral", "settings" } };
             for (int i = 0; i < entries.GetLength(0); i++) { string gesture = InterfacePreferences.Gesture(entries[i, 1]); C<MenuItem>(entries[i, 0]).InputGestureText = gesture == "Unassigned" ? "" : gesture; }
         }
         private async void HandleInterfaceKey(object sender, System.Windows.Input.KeyEventArgs e)
@@ -466,7 +466,7 @@ namespace DrumBuddy
             bool text = System.Windows.Input.Keyboard.FocusedElement is TextBox || System.Windows.Input.Keyboard.FocusedElement is ComboBox;
             if (text && !action.StartsWith("zoom", StringComparison.Ordinal) && !new[] { "save", "saveAs", "open", "new", "settings" }.Contains(action)) return;
             if (e.IsRepeat && !action.StartsWith("zoomIn", StringComparison.Ordinal) && !action.StartsWith("zoomOut", StringComparison.Ordinal)) { e.Handled = true; return; }
-            if (workspace != 3 && !(workspace == 2 && new[] { "play", "stop", "start", "end" }.Contains(action)) && !new[] { "home", "editor", "converter", "player", "settings", "timelineSettings", "new", "open", "save", "saveAs", "import", "export" }.Contains(action)) return;
+            if (workspace != 3 && !(workspace == 2 && new[] { "play", "stop", "start", "startAlternate", "end" }.Contains(action)) && !new[] { "home", "editor", "converter", "player", "mixer", "settings", "timelineSettings", "new", "open", "save", "saveAs", "import", "export" }.Contains(action)) return;
             e.Handled = true; await ExecuteInterfaceAction(action);
         }
         private async Task ExecuteInterfaceAction(string action)
@@ -481,6 +481,7 @@ namespace DrumBuddy
                 case "audio": OpenSettings("audio"); return;
                 case "keybinds": OpenSettings("keybinds"); return;
                 case "control": C<Button>("ControlTab").RaiseEvent(new RoutedEventArgs(Button.ClickEvent)); return;
+                case "mixer": if (workspace != 3) OpenWorkspace(true); if (workspace == 3 && editorView != null) editorView.ToggleMixer(); return;
                 case "recordOptions": if (workspace != 3) OpenWorkspace(true); if (editorView != null) editorView.ShowRecordingOptions(true); return;
                 case "record": if (recorder != null) await StopRecording(true); else await StartRecording(); return;
                 case "play": if (recorder != null) { await StopRecording(true); return; } break;
@@ -730,15 +731,16 @@ namespace DrumBuddy
                 recorder.Error = new IOException("No audio arrived from the selected input. Check its connection, microphone permissions and selected channels.");
             if (recorder.SourceFormat != null)
                 C<TextBlock>("CaptureFormatText").Text = "Input: " + (recorder.SourceIsFloat ? "native 32-bit float" : recorder.SourceFormat) + " | WAV: " + recorder.Bits + (recorder.Bits == 32 ? "-bit float" : "-bit PCM") + " | " + recorder.SampleRate + " Hz";
-            bool tooLoud = false;
+            bool tooLoud = false; var mixerInputs = new float[8];
             for (int i = 0; i < 8; i++) {
-                float peak = Interlocked.Exchange(ref recorder.Peaks[i],0);
+                float peak = Interlocked.Exchange(ref recorder.Peaks[i],0); mixerInputs[i] = peak;
                 double db = peak > 0 ? 20 * Math.Log10(peak) : -60;
                 meters[i].Value = Math.Max(0,Math.Min(1,(db + 60) / 60));
                 meters[i].Foreground = Brush(peak >= .99 ? "#B52C36" : "#007A6B");
                 meterLabels[i].Text = peak > .001 ? db.ToString("0",CultureInfo.InvariantCulture) + " dB" : "—";
                 tooLoud |= peak >= .99;
             }
+            if (editorView != null) editorView.UpdateRecordingInputMeters(mixerInputs);
             C<TextBlock>("RecordHint").Text = recorder.Bits == 32 && recorder.SourceIsFloat
                 ? (tooLoud ? "Peaks above 0 dBFS are kept in the float master. Enable Prevent PCM clipping when making a PCM copy." : "Recording the original float samples. Monitor through the recorder's headphones.")
                 : (tooLoud ? "Input is near full scale. Turn down the recorder's input level to prevent clipping." : "Set input levels on the recorder. Adjust a copy in Media Player.");
@@ -764,6 +766,7 @@ namespace DrumBuddy
                 "Set safe level brings the loudest peak to −1 dBFS. Prevent clipping caps excessive gain evenly; it preserves the dynamics of your drums.\n\n" +
                 "ZOOM R16\nExports are 44.1 kHz PCM WAV, mono or stereo, with names up to 8 uppercase characters. Use the bit depth of your R16 project. Copy WAVs to that project's AUDIO folder, then assign them to tracks on the R16.\n\n" +
                 "EDITOR + RECORD\nThe Editor opens by default. Record options contains input, channels, WAV format and sample rate. Record or R arms the selected track and shows one bar of countdown at the project tempo. Separate inputs reserve consecutive tracks. Stop, Record again or Escape cancels the countdown. Capture then starts through the selected input; the red playhead and elapsed timer follow captured audio. Stop & save preserves the take and adds it at the original starting point, leaving the playhead at its end. Use hardware direct monitoring while recording; software overdub synchronisation is not provided.\n\n" +
+                "MIXER\nOpen Mixer in the Editor or View menu. Track faders, pan, mute/solo and a master fader affect playback and exported mixes. File peak and Before fader meters help identify quiet sources; After fader shows the adjusted signal. Red peak indicators latch at 0 dBFS; click to clear. Monitor changes listening volume only. During recording, meters show the selected raw inputs; set capture gain on the input device.\n\n" +
                 "H5STUDIO FLOAT\nOn the recorder choose USB > Audio Interface > Connect. Audio I/F Only supports 44.1, 48 and 96 kHz. Stereo mix exposes a mixed stereo signal; Multi Track exposes separate inputs. Choose 32-bit float to keep the original float samples, including peaks above 0 dBFS. The app checks that the H5studio driver is actually sending float samples.\n\n" +
                 "PLAYBACK COMPATIBILITY\nSome players reject float or multichannel WAV files. Open Converter from View, enable Prevent PCM clipping and choose 16-bit or 24-bit WAV PCM. The original float master remains unchanged.\n\n" +
                 "FULL CONTROL\nAn R16 front-panel view with PC multitrack playback, mixer, EQ, recording and Mackie MIDI control. Open Menu reveals files, track settings, saved effects and devices. Escape returns home.\n\n" +
@@ -771,9 +774,9 @@ namespace DrumBuddy
                 "Use the R16 gain knobs to set recording levels. Listen through the R16's direct headphone monitoring.\n\n" +
                 "Install Drivers opens a short guide and links to Zoom's official driver download pages.\n\n" +
                 "MEDIA PLAYER\nOpen audio or video to listen. Gain / Save amplifies or reduces playback and saves adjusted WAV copies; Playback volume changes listening level only. Reset, Set safe level and Prevent clipping are available. Choose speakers/headphones under Audio output. Gain / Save can be resized, collapsed, or displayed on the side or bottom.\n\n" +
-                "EDITOR\nA 16-track audio timeline. Drag the upper ruler and release to place the playhead. The left edge snaps to zero; Home/To start goes to zero and End goes to the timeline end. Hold Alt to bypass snapping. Drag across a track to select time; two thinner blue sticks mark the selection start/end. Drag their lower-ruler handles to adjust the boundaries. Cut/copy/paste, split, undo/redo, Space to play/pause and Ctrl+S to save. Cuts leave a gap. Choose Selected track or All 16 tracks for edits. Save .dbedit sessions and export PCM or float WAV mixes. Original source files are preserved.\n\n" +
+                "EDITOR\nA 16-track audio timeline. Drag the upper ruler and release to place the playhead. The left edge snaps to zero; Home, Enter and To start go to zero; End goes to the timeline end. Ctrl+Left/Right jumps to the nearest bar line strictly left/right using the project tempo and time signature. Hold Alt to bypass snapping. Drag across a track to select time; two thinner blue sticks mark the selection start/end. Drag their lower-ruler handles to adjust the boundaries. Cut/copy/paste, split, undo/redo, Space to play/pause and Ctrl+S to save. Cuts leave a gap. Choose Selected track or All 16 tracks for edits. Save .dbedit sessions and export PCM or float WAV mixes. Original source files are preserved.\n\n" +
                 "THEME AND SETTINGS\nUse the top-right switch for dark or light theme. Settings has categories for General, Audio and Keybinds. Click Edit on a keybind and press the new shortcut immediately. Save writes the changes; leaving with pending changes asks whether to save them. S splits at the playhead; V returns to the selection cursor.\n\n" +
-                "Basic tools run locally without an account. This release is for Windows; macOS is planned.\n\nFlux 1.6.2 · FFmpeg + NAudio",
+                "Basic tools run locally without an account. This release is for Windows; macOS is planned.\n\nFlux 1.6.4 · FFmpeg + NAudio",
                 "Flux — quick help",MessageBoxButton.OK,MessageBoxImage.Information);
         }
     }
@@ -788,6 +791,7 @@ namespace DrumBuddy
             if (args.Length > 0 && args[0] == "--self-test") return SelfTest.Run(args.Skip(1).ToArray());
             if (args.Length > 0 && args[0] == "--float-self-test") return FloatRecordingTests.Run(args.Skip(1).ToArray());
             if (args.Length > 0 && args[0] == "--recording-self-test") return RecordingTests.Run(args.Skip(1).ToArray());
+            if (args.Length > 0 && args[0] == "--mixer-self-test") return EditorMixerTests.Run(args.Skip(1).ToArray());
             if (args.Length > 0 && args[0] == "--grid-self-test") return TempoGridTests.Run(args.Skip(1).ToArray());
             if (args.Length > 0 && args[0] == "--zoom-self-test") return ZoomTests.Run(args.Skip(1).ToArray());
             if (args.Length > 0 && args[0] == "--selection-self-test") return EditorSelectionTests.Run(args.Skip(1).ToArray());

package/source/Main.xaml

@@ -84,6 +84,7 @@
         <MenuItem x:Name="ViewHome" Header="Home" />
         <MenuItem x:Name="ViewEditor" Header="Editor + Record" />
         <MenuItem x:Name="ViewRecording" Header="Recording options" />
+        <MenuItem x:Name="ViewMixer" Header="Mixer" />
         <MenuItem x:Name="ViewConverter" Header="Converter" />
         <MenuItem x:Name="ViewPlayer" Header="Media Player" />
         <MenuItem x:Name="ViewControl" Header="R16 Full Control" />

package/source/MediaPlayerView.cs

@@ -187,7 +187,7 @@ namespace DrumBuddy
                 case "import": await ChooseFiles(); break;
                 case "play": PlayPause(); break;
                 case "stop": Stop(); break;
-                case "start": Seek(0); break;
+                case "start": case "startAlternate": Seek(0); break;
                 case "end": if (Selected != null) Seek(Selected.Duration); break;
                 default: return false;
             }

package/source/Quick Start.txt

@@ -1,4 +1,4 @@
-FLUX 1.6.2
+FLUX 1.6.4
 
 INSTALL / UPDATE
 Close the app. Run npm.cmd install -g @pro-gram/flux@latest
@@ -42,6 +42,19 @@ leaving the playhead at its end. Source files are preserved.
 Bar lines are labeled 1, 2, 3; beat labels remain available when zoomed in.
 Use direct headphone monitoring. Software overdub synchronization is not included.
 
+MIXER
+Open Mixer from the Editor toolbar or View menu. Scroll through all 16 tracks;
+the master stays visible. Drag the divider to resize, or choose Side/Bottom.
+Track faders (-60 to +24 dB), pan, mute and solo apply during playback and export.
+The master fader (-60 to +12 dB) changes the entire mix. Settings save in .dbedit
+sessions and support Undo/Redo. Original audio files stay unchanged.
+File peak shows the source level independently of gain. Before fader shows
+source signal, including muted tracks; After fader shows the adjusted level.
+Red peak readouts latch at 0 dBFS; click a readout or Clear peaks to reset.
+Monitor is listening volume only and does not affect exports or meter readings.
+During recording the strips show the registered raw inputs. Set capture gain
+on your input device; the mixer does not change the recorded original.
+
 AUDIO DEVICES
 Audio devices at the top right opens Settings > Audio. Save device changes.
 Windows default shows and follows the current Windows speakers/headphones.
@@ -81,7 +94,9 @@ Ctrl+D: duplicate. Ctrl+L: repeat selected clips/range. M: clip mute. X: crossfa
 Right-click audio for the editing menu. Edits, fades and mute support Undo.
 Ctrl+X/C/V: cut/copy/paste. Backspace/Delete: remove selection. Ctrl+Z/Y: undo/redo.
 Ctrl+S: save session. Ctrl+Shift+S: save as. Ctrl+O/N: open/new.
-Ctrl+I/E: import/export. Home/End: timeline beginning/end.
+Ctrl+I/E: import/export. Home or Enter: timeline beginning. End: timeline end.
+Ctrl+Left/Right: nearest bar line strictly left/right using the project tempo
+and time signature. From a bar line, jump to the previous/next bar.
 Ctrl+1/2/3/4: Home/Editor/Converter/Player. Ctrl+comma: Settings.
 
 MEDIA PLAYER / R16

package/source/RecordingTests.cs

@@ -95,6 +95,8 @@ namespace DrumBuddy
                         Picture(editor, Path.Combine(root, "countdown-dark.png"), 1280, 760);
                         Check(!await editor.ExecuteAction("start") && editor.PlayheadFrame == plan.AnchorFrame,
                             "Protect the recording anchor from transport edits during count-in");
+                        Check(!await editor.ExecuteAction("previousBar") && !await editor.ExecuteAction("nextBar") && !await editor.ExecuteAction("startAlternate") && editor.PlayheadFrame == plan.AnchorFrame,
+                            "Ignore bar navigation and Enter during count-in so the registered recording anchor cannot move");
                         editor.SetRecordingState(false);
                         Check(!editor.IsBusy && editor.ArmedTracksForTest.Length == 0 && editor.RecordingOverlaysForTest == 0,
                             "Release reserved tracks and recording visuals after cancellation");

package/source/Setup.cs

@@ -14,7 +14,7 @@ using System.Windows.Markup;
 using Microsoft.Win32;
 
 [assembly: AssemblyTitle("Flux Setup")]
-[assembly: AssemblyVersion("1.6.2.0")]
+[assembly: AssemblyVersion("1.6.4.0")]
 
 namespace DrumBuddySetup
 {
@@ -101,7 +101,7 @@ namespace DrumBuddySetup
                     Directory.CreateDirectory(Path.GetDirectoryName(destination));
                     File.Copy(source,destination,true);
                 }
-                File.WriteAllText(Path.Combine(InstallPath,".drumbuddy-installed"),"Flux 1.6.2\n" + InstallPath,Encoding.UTF8);
+                File.WriteAllText(Path.Combine(InstallPath,".drumbuddy-installed"),"Flux 1.6.4\n" + InstallPath,Encoding.UTF8);
                 string[] files = Directory.GetFiles(stage,"*",SearchOption.AllDirectories).Select(f => f.Substring(stage.Length + 1)).Concat(new[] { ".drumbuddy-installed","installed-files.txt" }).ToArray();
                 File.WriteAllLines(Path.Combine(InstallPath,"installed-files.txt"),files,Encoding.UTF8);
                 string exe = Path.Combine(InstallPath,"DrumBuddy.exe");
@@ -112,7 +112,7 @@ namespace DrumBuddySetup
                 RemoveLegacyShortcut(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.StartMenu),"Programs","Drum Buddy.lnk"),exe);
                 RemoveLegacyShortcut(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory),"Drum Buddy.lnk"),exe);
                 using (var key = Microsoft.Win32.Registry.CurrentUser.CreateSubKey(RegistryKey)) {
-                    key.SetValue("DisplayName","Flux"); key.SetValue("DisplayVersion","1.6.2"); key.SetValue("Publisher","Flux");
+                    key.SetValue("DisplayName","Flux"); key.SetValue("DisplayVersion","1.6.4"); key.SetValue("Publisher","Flux");
                     key.SetValue("InstallLocation",InstallPath); key.SetValue("DisplayIcon",BrandIcon);
                     key.SetValue("UninstallString","\"" + Path.Combine(InstallPath,"Uninstall.exe") + "\"");
                     key.SetValue("NoModify",1); key.SetValue("NoRepair",1);

package/source/ShellStyles.xaml

@@ -25,11 +25,17 @@
   </Style>
   <Style TargetType="Slider">
     <Setter Property="Height" Value="22"/>
-    <Setter Property="Template"><Setter.Value><ControlTemplate TargetType="Slider"><Track x:Name="PART_Track" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" Value="{Binding Value,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" VerticalAlignment="Center">
-      <Track.DecreaseRepeatButton><RepeatButton Command="Slider.DecreaseLarge"><RepeatButton.Template><ControlTemplate TargetType="RepeatButton"><Border Background="{DynamicResource Theme006D68}" Height="3" CornerRadius="1"/></ControlTemplate></RepeatButton.Template></RepeatButton></Track.DecreaseRepeatButton>
-      <Track.Thumb><Thumb Width="12" Height="12"><Thumb.Template><ControlTemplate TargetType="Thumb"><Ellipse Fill="{DynamicResource Theme182C37}"/></ControlTemplate></Thumb.Template></Thumb></Track.Thumb>
-      <Track.IncreaseRepeatButton><RepeatButton Command="Slider.IncreaseLarge"><RepeatButton.Template><ControlTemplate TargetType="RepeatButton"><Border Background="{DynamicResource ThemeC3CED0}" Height="3" CornerRadius="1"/></ControlTemplate></RepeatButton.Template></RepeatButton></Track.IncreaseRepeatButton>
-    </Track></ControlTemplate></Setter.Value></Setter>
+    <Setter Property="Template"><Setter.Value><ControlTemplate TargetType="Slider"><Track x:Name="PART_Track" Orientation="{TemplateBinding Orientation}" IsDirectionReversed="{TemplateBinding IsDirectionReversed}" Minimum="{TemplateBinding Minimum}" Maximum="{TemplateBinding Maximum}" Value="{Binding Value,RelativeSource={RelativeSource TemplatedParent},Mode=TwoWay}" VerticalAlignment="Center">
+      <Track.DecreaseRepeatButton><RepeatButton x:Name="Decrease" Command="Slider.DecreaseLarge" Height="3" Background="{DynamicResource Theme006D68}"><RepeatButton.Template><ControlTemplate TargetType="RepeatButton"><Border Background="{TemplateBinding Background}" CornerRadius="1"/></ControlTemplate></RepeatButton.Template></RepeatButton></Track.DecreaseRepeatButton>
+      <Track.Thumb><Thumb x:Name="SliderThumb" Width="12" Height="12"><Thumb.Template><ControlTemplate TargetType="Thumb"><Ellipse Fill="{DynamicResource Theme182C37}"/></ControlTemplate></Thumb.Template></Thumb></Track.Thumb>
+      <Track.IncreaseRepeatButton><RepeatButton x:Name="Increase" Command="Slider.IncreaseLarge" Height="3" Background="{DynamicResource ThemeC3CED0}"><RepeatButton.Template><ControlTemplate TargetType="RepeatButton"><Border Background="{TemplateBinding Background}" CornerRadius="1"/></ControlTemplate></RepeatButton.Template></RepeatButton></Track.IncreaseRepeatButton>
+    </Track><ControlTemplate.Triggers><Trigger Property="Orientation" Value="Vertical">
+      <Setter TargetName="PART_Track" Property="VerticalAlignment" Value="Stretch"/>
+      <Setter TargetName="Decrease" Property="Height" Value="Auto"/><Setter TargetName="Decrease" Property="Width" Value="3"/>
+      <Setter TargetName="Increase" Property="Height" Value="Auto"/><Setter TargetName="Increase" Property="Width" Value="3"/>
+      <Setter TargetName="SliderThumb" Property="Width" Value="22"/><Setter TargetName="SliderThumb" Property="Height" Value="12"/>
+      <Setter TargetName="SliderThumb" Property="Template"><Setter.Value><ControlTemplate TargetType="Thumb"><Border Background="{DynamicResource Theme182C37}" BorderBrush="{DynamicResource Theme006D68}" BorderThickness="1" CornerRadius="2"><Border Height="1" Margin="3,0" Background="{DynamicResource Theme526771}"/></Border></ControlTemplate></Setter.Value></Setter>
+    </Trigger></ControlTemplate.Triggers></ControlTemplate></Setter.Value></Setter>
   </Style>
   <Style TargetType="TextBox">
     <Setter Property="Background" Value="{DynamicResource ThemeFFFFFF}"/><Setter Property="Foreground" Value="{DynamicResource Theme182C37}"/>

package/source/TempoGrid.cs

@@ -34,6 +34,20 @@ namespace DrumBuddy
         public static double StepSeconds(TempoGridOptions options) { return 240.0 / options.Tempo / options.Division * (options.Triplet ? 2.0 / 3 : 1); }
         public static double BeatSeconds(TempoGridOptions options) { return 240.0 / options.Tempo / options.BeatUnit; }
         public static double BarSeconds(TempoGridOptions options) { return BeatSeconds(options) * options.BeatsPerBar; }
+        public static long AdjacentBar(long frame, TempoGridOptions options, int direction)
+        {
+            options.Validate();
+            if (direction != -1 && direction != 1) throw new ArgumentOutOfRangeException("direction");
+            frame = Math.Max(0, Math.Min(EditorSession.MaxFrame, frame));
+            if (direction < 0 && frame == 0 || direction > 0 && frame == EditorSession.MaxFrame) return frame;
+            double framesPerBar = BarSeconds(options) * Audio.Rate;
+            long index = (long)Math.Floor(frame / framesPerBar);
+            if (direction > 0) {
+                do { index++; } while (FrameAt(index * framesPerBar) <= frame);
+            }
+            else while (index > 0 && FrameAt(index * framesPerBar) >= frame) index--;
+            return FrameAt(index * framesPerBar);
+        }
         public static long Snap(long frame, TempoGridOptions options)
         {
             double seconds = Math.Max(0, frame) / (double)Audio.Rate, bar = BarSeconds(options), step = StepSeconds(options);

package/source/TempoGridTests.cs

@@ -35,6 +35,32 @@ namespace DrumBuddy
             try {
                 InterfacePreferences.Current = InterfacePreferences.Defaults();
                 var grid = new TempoGridOptions(); grid.Validate();
+                Check(InterfacePreferences.Resolve(Key.Left, ModifierKeys.Control) == "previousBar" && InterfacePreferences.Resolve(Key.Right, ModifierKeys.Control) == "nextBar", "Resolve Ctrl+Left and Ctrl+Right to bar navigation");
+                Check(InterfacePreferences.Resolve(Key.Enter, ModifierKeys.None) == "startAlternate" && InterfacePreferences.Resolve(Key.Return, ModifierKeys.None) == "startAlternate" && InterfacePreferences.Resolve(Key.Home, ModifierKeys.None) == "start" && InterfacePreferences.Gesture("startAlternate") == "Enter", "Resolve Enter and Return to the beginning while retaining Home and showing Enter in keybind settings");
+                Check(TempoGrid.AdjacentBar(Audio.Rate * 3L, grid, -1) == Audio.Rate * 2L && TempoGrid.AdjacentBar(Audio.Rate * 3L, grid, 1) == Audio.Rate * 4L, "Jump from within a bar to the nearest bar strictly left or right");
+                Check(TempoGrid.AdjacentBar(Audio.Rate * 2L, grid, -1) == 0 && TempoGrid.AdjacentBar(Audio.Rate * 2L, grid, 1) == Audio.Rate * 4L, "Jump a full bar when already exactly on a bar line");
+                Check(TempoGrid.AdjacentBar(Audio.Rate * 2L - 1, grid, 1) == Audio.Rate * 2L && TempoGrid.AdjacentBar(Audio.Rate * 2L + 1, grid, -1) == Audio.Rate * 2L, "Find the neighboring bar from one sample on either side of its boundary");
+                Check(TempoGrid.AdjacentBar(0, grid, -1) == 0 && TempoGrid.AdjacentBar(EditorSession.MaxFrame, grid, 1) == EditorSession.MaxFrame && TempoGrid.AdjacentBar(EditorSession.MaxFrame - 1, grid, 1) == EditorSession.MaxFrame, "Clamp bar navigation at the beginning and timeline limit");
+                var oddMeter = new TempoGridOptions { Tempo = 123, BeatsPerBar = 7, BeatUnit = 8, Division = 256, Triplet = true };
+                double barFrames = TempoGrid.BarSeconds(oddMeter) * Audio.Rate;
+                foreach (int barIndex in new[] { 1, 2, 13, 10000, 50000 }) {
+                    long barFrame = (long)Math.Round(barIndex * barFrames, MidpointRounding.AwayFromZero);
+                    Check(TempoGrid.AdjacentBar(barFrame, oddMeter, -1) == (long)Math.Round((barIndex - 1) * barFrames, MidpointRounding.AwayFromZero)
+                        && TempoGrid.AdjacentBar(barFrame, oddMeter, 1) == (long)Math.Round((barIndex + 1) * barFrames, MidpointRounding.AwayFromZero)
+                        && TempoGrid.AdjacentBar(barFrame + 1, oddMeter, -1) == barFrame && TempoGrid.AdjacentBar(barFrame - 1, oddMeter, 1) == barFrame,
+                        "Avoid rounded-frame drift with fractional bar lengths in 7/8 at bar " + barIndex);
+                }
+                var oldKeys = InterfacePreferences.Defaults(); oldKeys.Keybinds.RemoveAll(b => new[] { "previousBar", "nextBar", "startAlternate" }.Contains(b.Action));
+                InterfacePreferences.Upgrade(oldKeys); InterfacePreferences.Validate(oldKeys);
+                Check(oldKeys.Keybinds.Any(b => b.Action == "previousBar" && b.Key == "Left" && b.Modifiers == (int)ModifierKeys.Control) && oldKeys.Keybinds.Any(b => b.Action == "startAlternate" && b.Key == "Return"), "Add new navigation shortcuts to existing saved keymaps");
+                var customNavigation = InterfacePreferences.Defaults(); customNavigation.Keybinds.RemoveAll(b => new[] { "previousBar", "nextBar", "startAlternate" }.Contains(b.Action));
+                var customLeft = customNavigation.Keybinds.First(b => b.Action == "split"); customLeft.Key = "Left"; customLeft.Modifiers = (int)ModifierKeys.Control;
+                customNavigation.Keybinds.First(b => b.Action == "play").Key = "Enter";
+                InterfacePreferences.Upgrade(customNavigation); InterfacePreferences.Validate(customNavigation);
+                Check(customNavigation.Keybinds.First(b => b.Action == "previousBar").Key == "None" && customNavigation.Keybinds.First(b => b.Action == "startAlternate").Key == "None" && customNavigation.Keybinds.First(b => b.Action == "play").Key == "Enter", "Preserve customized Ctrl+Left and Enter bindings when upgrading a keymap");
+                var duplicateEnter = InterfacePreferences.Defaults(); duplicateEnter.Keybinds.First(b => b.Action == "play").Key = "Enter"; bool aliasRejected = false;
+                try { InterfacePreferences.Validate(duplicateEnter); } catch (IOException) { aliasRejected = true; }
+                Check(aliasRejected, "Treat Enter and Return as the same key when checking shortcut conflicts");
                 Check(Math.Abs(TempoGrid.StepSeconds(grid) - .125) < 1e-12, "At 120 BPM, a sixteenth note lasts 0.125 seconds");
                 grid.Division = 32; Check(Math.Abs(TempoGrid.StepSeconds(grid) - .0625) < 1e-12, "At 120 BPM, a thirty-second note lasts 0.0625 seconds");
                 grid.Division = 256; Check(Math.Abs(TempoGrid.StepSeconds(grid) - .0078125) < 1e-12, "Allow fine divisions through 1/256");
@@ -99,6 +125,18 @@ namespace DrumBuddy
                     editor.ApplyGridOptions(new TempoGridOptions { Tempo = 150, Division = 32 }); RunUi(() => editor.ExecuteAction("undo"));
                     Check(editor.GridOptions.Tempo == 120 && editor.SessionForTest.Regions.Any(r => r.Start == 88200), "Undo a tempo-grid change without undoing the audio paste");
                     Check(original.SequenceEqual(File.ReadAllBytes(source)), "Keep the original float audio unchanged through grid editing and copy/delete/paste");
+                    editor.PlayheadForTest(Audio.Rate * 3L);
+                    RunUi(() => editor.ExecuteAction(InterfacePreferences.Resolve(Key.Left, ModifierKeys.Control)));
+                    Check(editor.PlayheadFrame == Audio.Rate * 2L, "Move the actual editor playhead to the left bar line");
+                    RunUi(() => editor.ExecuteAction(InterfacePreferences.Resolve(Key.Left, ModifierKeys.Control)));
+                    Check(editor.PlayheadFrame == 0, "Repeated Ctrl+Left moves to the preceding bar from an exact boundary");
+                    RunUi(() => editor.ExecuteAction(InterfacePreferences.Resolve(Key.Right, ModifierKeys.Control)));
+                    RunUi(() => editor.ExecuteAction(InterfacePreferences.Resolve(Key.Right, ModifierKeys.Control)));
+                    Check(editor.PlayheadFrame == Audio.Rate * 4L, "Repeated Ctrl+Right moves the editor forward by complete bars");
+                    RunUi(() => editor.ExecuteAction(InterfacePreferences.Resolve(Key.Enter, ModifierKeys.None)));
+                    Check(editor.PlayheadFrame == 0, "Enter returns the actual editor playhead to the beginning");
+                    editor.PlayheadForTest(Audio.Rate * 3L); RunUi(() => editor.ExecuteAction(InterfacePreferences.Resolve(Key.Home, ModifierKeys.None)));
+                    Check(editor.PlayheadFrame == 0 && original.SequenceEqual(File.ReadAllBytes(source)), "Home still returns to the beginning and transport navigation preserves original audio");
                 }
                 owner.Content = null; owner.Close();
                 File.WriteAllLines(Path.Combine(root, "grid-test-results.txt"), log, Encoding.UTF8); return 0;

package/source/Third Party Notices.txt

@@ -1,4 +1,4 @@
-Flux 1.6.2 - third-party components
+Flux 1.6.4 - third-party components
 
 FFmpeg 9.0.2, release essentials build by Gyan Doshi
 Used as a separate command-line decoding process.