@pro-gram/flux 1.6.1 → 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);
@@ -119,6 +120,7 @@ namespace DrumBuddy
             separate = new CheckBox { Content = "Import files on separate tracks", IsChecked = true, FontSize = 14, Margin = new Thickness(4, 0, 0, 8), VerticalAlignment = VerticalAlignment.Center }; editing.Children.Add(separate);
             compactOptionsButton = WorkspaceUi.Button("Audio / export options", delegate { compactOptions = !compactOptions; UpdateCompactLayout(); }); editing.Children.Add(compactOptionsButton);
 
+            InitializeRecordingFeedback(tools);
             gridControls = new WrapPanel { Margin = new Thickness(0, 0, 0, 3) }; tools.Children.Add(gridControls);
             gridControls.Children.Add(WorkspaceUi.Text("BPM  ", 12));
             tempoBox = new TextBox { Width = 60, MinHeight = 28, Padding = new Thickness(5, 3, 5, 3), Margin = new Thickness(0, 0, 9, 5) }; gridControls.Children.Add(tempoBox);
@@ -202,10 +204,11 @@ namespace DrumBuddy
             var transport = new WrapPanel(); bottom.Children.Add(transport);
             play = WorkspaceUi.Button("Play", delegate { PlayPause(); }); play.MinWidth = 90; transport.Children.Add(play);
             transport.Children.Add(WorkspaceUi.Button("Stop", delegate { if (recording && StopRequested != null) StopRequested(); else { Stop(); UpdateTransport(); } }));
-            transport.Children.Add(WorkspaceUi.Button("To start", delegate { Stop(); playhead = 0; DrawCanvas(); EnsurePlayheadVisible(); }));
+            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);
@@ -217,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(); };
         }
 
@@ -413,21 +417,23 @@ namespace DrumBuddy
             for (int i = 0; i < 16; i++) {
                 int index = i; var state = session.Tracks[i];
                 var panel = new StackPanel { Margin = new Thickness(7, 3, 7, 3) };
-                var name = WorkspaceUi.Text((i + 1).ToString("00") + "  " + state.Name, 14); name.TextWrapping = TextWrapping.NoWrap; name.TextTrimming = TextTrimming.CharacterEllipsis; name.FontWeight = FontWeights.SemiBold; panel.Children.Add(name);
+                var name = WorkspaceUi.Text((i + 1).ToString("00") + (RecordingTrack(i) ? (captureRunning ? " REC  " : " ARM  ") : "  ") + state.Name, 14); name.TextWrapping = TextWrapping.NoWrap; name.TextTrimming = TextTrimming.CharacterEllipsis; name.FontWeight = FontWeights.SemiBold; panel.Children.Add(name);
+                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);
-                var border = new Border { Height = RowHeight, BorderThickness = new Thickness(0, 0, 1, 1), BorderBrush = WorkspaceUi.Color("#D6E1DF"), Background = WorkspaceUi.Color(i == track ? "#DCEFEB" : "#EDF3F1"), Child = panel };
+                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()
         {
@@ -451,10 +457,12 @@ namespace DrumBuddy
                 if (tick.Label != null) { if (x >= left && x < left + ViewportWidth) visibleLabel = true; var label = WorkspaceUi.Text(tick.Label, 11); label.IsHitTestVisible = false; Canvas.SetLeft(label, x + 4); Canvas.SetTop(label, 3); timeline.Children.Add(label); }
             }
             if (!session.Grid.MusicalRuler || !visibleLabel) DrawTimeRuler(left, right);
+            DrawRecordingOverlays();
             timeline.Children.Add(selectionOverlay); timeline.Children.Add(selectionStartLine); timeline.Children.Add(selectionEndLine); timeline.Children.Add(selectionStartHandle); timeline.Children.Add(selectionEndHandle); UpdateSelectionOverlay();
             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()
         {
@@ -517,13 +525,13 @@ namespace DrumBuddy
         }
         private void UpdatePlayLine() { playLine.X1 = playLine.X2 = X(playhead); }
         private void UpdateTransport()
-        { positionText.Text = WorkspaceUi.Clock(playhead / (double)Audio.Rate) + " / " + WorkspaceUi.Clock(session.End / (double)Audio.Rate); }
+        { positionText.Text = WorkspaceUi.Clock(playhead / (double)Audio.Rate) + " / " + WorkspaceUi.Clock(Math.Max(session.End, recording ? playhead : 0) / (double)Audio.Rate); }
         private void EnsurePlayheadVisible()
         { double x = X(playhead); if (x < scroll.HorizontalOffset || x > scroll.HorizontalOffset + scroll.ViewportWidth - 15) scroll.ScrollToHorizontalOffset(Math.Max(0, x - 30)); }
 
         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 {
@@ -535,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)
@@ -594,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" };
@@ -627,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."); }
@@ -671,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);
@@ -685,12 +702,15 @@ namespace DrumBuddy
         internal DockablePane RecordingPaneForTest { get { return recordingPane; } }
         public void SetRecordingState(bool active)
         {
-            recording = active; recordButton.Content = active ? "Stop recording" : "Record";
+            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)
+        public async Task AddRecordedFiles(IEnumerable<string> paths, long at, int firstTrack, bool keepPlayhead = false)
         {
             if (IsBusy) throw new IOException("Finish the editor operation before adding the take.");
             var files = paths.Where(File.Exists).ToArray();
@@ -706,17 +726,19 @@ namespace DrumBuddy
                     if (session.Tracks[index].Name == "Track " + (index + 1)) session.Tracks[index].Name = Path.GetFileNameWithoutExtension(clip.Name);
                 }
                 try { session.Validate(); } catch { session = before; throw; }
-                undo.Push(before); redo.Clear(); dirty = true; track = firstTrack; playhead = at;
+                undo.Push(before); redo.Clear(); dirty = true; track = firstTrack;
+                playhead = keepPlayhead ? Math.Min(EditorSession.MaxFrame, at + decoded.Max(c => (long)Math.Round(c.Duration * Audio.Rate))) : at;
             }
             finally { EndWork(); BuildHeaders(); DrawCanvas(); }
         }
         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;
@@ -733,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;
@@ -762,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)