@pro-gram/flux 1.5.0 → 1.6.1

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.StartsWith("D") && Key.Length == 2 && char.IsDigit(Key[1]) ? Key.Substring(1) : Key);
+                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);
             }
         }
     }
@@ -53,19 +53,22 @@ namespace DrumBuddy
         public static readonly string SettingsFile = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "DrumBuddy", "interface-settings.xml");
         public static readonly Dictionary<string, string> Actions = new Dictionary<string, string> {
             { "play", "Play / pause" }, { "stop", "Stop playback" }, { "record", "Start / stop recording" },
-            { "split", "Split at playhead" }, { "scissors", "Toggle scissors tool" }, { "copy", "Copy selection" },
+            { "split", "Split at playhead" }, { "scissors", "Toggle slice cursor (legacy)" }, { "selectTool", "Selection cursor" }, { "copy", "Copy selection" },
+            { "slipTool", "Slip source contents tool" }, { "fadeTool", "Fade tool" }, { "duplicate", "Duplicate selected audio" }, { "repeatClips", "Repeat selected audio" }, { "muteClips", "Mute / unmute selected clips" }, { "crossfade", "Crossfade selected clips" }, { "clearFades", "Clear clip fades" },
             { "cut", "Cut selection" }, { "paste", "Paste at playhead" }, { "delete", "Delete selection" },
             { "deleteAlternate", "Delete selection (alternate)" },
             { "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" },
             { "converter", "Open Converter" }, { "player", "Open Media Player" }, { "settings", "Open Settings" }
-            , { "timelineSettings", "Open Timeline 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" }
         };
         public static InterfaceSettings Defaults()
         {
             var settings = new InterfaceSettings { KeymapRevision = 1 };
-            string[] simple = { "play:Space", "stop:Space:Shift", "record:R", "split:S", "scissors:K", "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" };
+            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();
             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 });
@@ -81,6 +84,7 @@ namespace DrumBuddy
                 Validate(settings);
             }
             catch { settings = Defaults(); settings.AudioOutputKey = legacyOutput ?? "default"; settings.AudioInputKey = legacyInput; }
+            settings.AudioOutputKey = AudioOutputs.NormalizeKey(settings.AudioOutputKey);
             Current = settings; ThemePalette.Apply(settings.Theme == "Dark"); AudioOutputs.LatencyMilliseconds = settings.PlaybackLatency;
         }
         public static void Validate(InterfaceSettings settings)
@@ -102,6 +106,7 @@ namespace DrumBuddy
         }
         public static void Upgrade(InterfaceSettings settings)
         {
+            settings.AudioOutputKey = AudioOutputs.NormalizeKey(settings.AudioOutputKey);
             if (settings.Grid == null) settings.Grid = new TempoGridOptions();
             if (settings.Keybinds == null) settings.Keybinds = new List<ShortcutBinding>();
             if (settings.KeymapRevision < 1) {
@@ -162,6 +167,7 @@ namespace DrumBuddy
             { "#F0F8F5", "#192139" }, { "#E4ECEA", "#202536" }, { "#DCEFEB", "#1C2943" }, { "#EDF3F1", "#171B26" },
             { "#D6E1DF", "#2C3349" }, { "#E0E8E5", "#242B3C" }, { "#DAE5E0", "#2A2B43" }, { "#B9DDD2", "#334567" },
             { "#438B77", "#59CCFF" }, { "#5E9D89", "#7D9CFA" }, { "#CBD8D4", "#353951" }, { "#D0772C", "#FFB55E" },
+            { "#DAD5FA", "#3A315D" }, { "#7359C7", "#B497FF" },
             { "#D17626", "#FFB55E" }, { "#277FA5", "#64CBFF" }, { "#386BA8", "#A28CFF" }, { "#5596C8", "#6BAAFF" },
             { "#15877C", "#45B8F0" }, { "#16887D", "#45B8F0" }, { "#B52C36", "#EE657D" }, { "#D16A19", "#B3A0FF" }
         };

package/source/InterfaceTests.cs

@@ -74,6 +74,7 @@ namespace DrumBuddy
                 Picture(new Image { Source = BrandArtwork.Load(), Stretch = Stretch.Uniform }, Path.Combine(root, "refined-vector-logo.png"), 840, 640);
                 var main = new MainWindow(Path.Combine(root, "legacy-preferences.xml"), true);
                 Check(main.NativeWindow.Title == "Flux", "Use exactly Flux as the window title");
+                Check(object.ReferenceEquals(main.NativeWindow.Icon, BrandArtwork.Raster()), "Use the current Flux mark directly for the window and taskbar icon");
                 main.OpenEditorForTest(); Check(main.IntegratedRecorderForTest, "Mount recording controls inside the main Editor while retaining named input controls");
                 string demoPath = Path.Combine(root, "Generated demo.wav"); var demo = new float[Audio.Rate * 8];
                 for (int i = 0; i < demo.Length; i++) demo[i] = (float)(.7 * Math.Exp(-(i % (Audio.Rate / 2)) / 3000.0) * Math.Sin(i * .06));
@@ -84,6 +85,7 @@ namespace DrumBuddy
                 for (int i = 0; i < names.Length; i++) { demoSession.Tracks[i].Name = names[i]; demoSession.Regions.Add(new TimelineRegion { Source = demoClip.Source, Name = names[i], Track = i, Start = (i % 3) * Audio.Rate / 2, Length = (6 - i % 3) * Audio.Rate }); }
                 main.EditorFixtureForTest(demoSession, new Dictionary<string, Clip> { { demoClip.Source, demoClip } });
                 Check(!Buttons(main.RecordingPaneForTest.MainContent).Any(b => new[] { "Cut", "Copy", "Paste" }.Contains(b.Content as string)), "Remove Cut, Copy and Paste buttons from the editor toolbar");
+                Check(!Buttons(main.RecordingPaneForTest.MainContent).Any(b => ((b.Content as string) ?? "").Contains("Split") || ((b.Content as string) ?? "").Contains("Scissors")), "Keep split on the S action and remove redundant scissors/split toolbar buttons");
                 Check(main.NativeWindow.FindName("SettingsTimeline") != null, "Expose Timeline / grid in Settings");
                 var initialGrid = InterfacePreferences.Current.Copy(); initialGrid.Grid = main.GridForTest;
                 string gridSettingsFile = Path.Combine(root, "saved-grid-settings.xml");
@@ -105,7 +107,11 @@ namespace DrumBuddy
                 main.SetGridForTest(new TempoGridOptions { Division = 128, Triplet = true }, 1280); Picture((FrameworkElement)main.NativeWindow.Content, Path.Combine(root, "editor-grid-128-triplet-dark.png"), 1280, 800);
                 main.EditorFixtureForTest(demoSession, new Dictionary<string, Clip> { { demoClip.Source, demoClip } }); main.SetGridForTest(demoSession.Grid, 40); main.OpenEditorForTest();
                 Picture((FrameworkElement)main.NativeWindow.Content, Path.Combine(root, "editor-shell-dark.png"), 1280, 800);
+                Check(main.EditorTimelineHeightForTest >= 550, "Reserve at least 550 vertical pixels for the timeline at 1280 x 800");
+                log.Add("Timeline viewport at 1280 x 800: " + main.EditorTimelineHeightForTest.ToString("0") + " px.");
                 Picture((FrameworkElement)main.NativeWindow.Content, Path.Combine(root, "editor-compact-dark.png"), 850, 560);
+                Check(main.EditorTimelineHeightForTest >= 250, "Keep a usable timeline after packing controls at 850 x 560");
+                log.Add("Timeline viewport at 850 x 560: " + main.EditorTimelineHeightForTest.ToString("0") + " px.");
                 main.RecordingPanelForTest(); Picture((FrameworkElement)main.NativeWindow.Content, Path.Combine(root, "editor-record-dark.png"), 1280, 800);
                 Picture((FrameworkElement)main.NativeWindow.Content, Path.Combine(root, "editor-record-compact-dark.png"), 850, 560);
                 main.RecordingPaneForTest.SetBottom(true); Picture((FrameworkElement)main.NativeWindow.Content, Path.Combine(root, "editor-record-bottom-compact-dark.png"), 850, 560);

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.5.0.0")]
+[assembly: AssemblyVersion("1.6.1.0")]
 
 namespace DrumBuddy
 {
@@ -34,9 +34,8 @@ namespace DrumBuddy
     public sealed class OutputChoice
     {
         public string Name, Driver, EndpointId;
-        public int Device = -1;
-        public bool Compatibility;
-        public string Key { get { return Compatibility ? "compat:" + (EndpointId ?? "default") : Driver != null ? "asio:" + Driver : EndpointId != null ? "windows:" + EndpointId : "default"; } }
+        public string DefaultEndpointId;
+        public string Key { get { return Driver != null ? "asio:" + Driver : EndpointId != null ? "windows:" + EndpointId : "default"; } }
         public override string ToString() { return Name; }
     }
     public sealed class ModeChoice
@@ -102,8 +101,7 @@ namespace DrumBuddy
             window.Height = Math.Min(window.Height, SystemParameters.WorkArea.Height - 30);
             window.Width = Math.Min(window.Width, SystemParameters.WorkArea.Width - 30);
             C<Image>("BrandLogo").Source = BrandArtwork.Raster();
-            window.Icon = System.Windows.Interop.Imaging.CreateBitmapSourceFromHIcon(System.Drawing.Icon.ExtractAssociatedIcon(Assembly.GetExecutingAssembly().Location).Handle,
-                Int32Rect.Empty, System.Windows.Media.Imaging.BitmapSizeOptions.FromEmptyOptions());
+            window.Icon = BrandArtwork.Raster();
             try { using (var s = File.OpenRead(settings)) prefs = (Preferences)new XmlSerializer(typeof(Preferences)).Deserialize(s); }
             catch { prefs = new Preferences(); }
             if (!testMode) InterfacePreferences.Load(prefs.AudioOutputKey, prefs.AudioInputKey);
@@ -253,7 +251,7 @@ namespace DrumBuddy
             var inputs = AudioInputs.Choices(); configuringCapture = true; C<ComboBox>("InputDevice").ItemsSource = inputs; C<ComboBox>("InputDevice").SelectedItem = inputs.FirstOrDefault(c => c.Driver == null); configuringCapture = false;
             ConfigureRecordingDevice(); editorView.ShowRecordingOptions(true);
         }
-        internal void SetThemeForTest(bool dark) { ThemePalette.Apply(dark); ThemePalette.Install(window); C<Button>("ThemeToggle").Content = dark ? "Light theme" : "Dark theme"; }
+        internal void SetThemeForTest(bool dark) { ThemePalette.Apply(dark); ThemePalette.Install(window); C<Button>("ThemeToggle").Content = dark ? "Light" : "Dark"; }
         internal void OpenConverterForTest() { SwitchPage(false); }
         internal DockablePane ConverterPaneForTest { get { return converterPane; } }
         internal DockablePane RecordingPaneForTest { get { return editorView.RecordingPaneForTest; } }
@@ -262,6 +260,7 @@ namespace DrumBuddy
         internal void ApplySettingsForTest(InterfaceSettings value) { InterfacePreferences.Current = value.Copy(); ThemePalette.Apply(value.Theme == "Dark"); ApplyInterfaceSettings(); }
         internal TempoGridOptions GridForTest { get { return editorView.GridOptions; } }
         internal void SetGridForTest(TempoGridOptions value, double zoom) { editorView.ApplyGridOptions(value); editorView.ZoomForTest(zoom); }
+        internal double EditorTimelineHeightForTest { get { return editorView.TimelineHeightForTest; } }
         internal bool IntegratedRecorderForTest { get { return editorView != null && C<StackPanel>("RecordPage").Parent != null && C<ComboBox>("InputDevice") != null; } }
         private static Brush Brush(string hex) { return ThemePalette.Brush(hex); }
         private void Status(string text) { C<TextBlock>("StatusText").Text = text; C<Border>("StatusHost").Visibility = string.IsNullOrWhiteSpace(text) ? Visibility.Collapsed : Visibility.Visible; }
@@ -411,7 +410,7 @@ namespace DrumBuddy
         }
         private void ApplyInterfaceSettings()
         {
-            ThemePalette.Install(window); C<Button>("ThemeToggle").Content = ThemePalette.Dark ? "Light theme" : "Dark theme";
+            ThemePalette.Install(window); C<Button>("ThemeToggle").Content = ThemePalette.Dark ? "Light" : "Dark";
             var settings = InterfacePreferences.Current;
             string gridSignature = settings.Grid.Signature();
             if (appliedGridDefaults != gridSignature) { appliedGridDefaults = gridSignature; if (editorView != null) editorView.ApplyGridOptions(settings.Grid); }
@@ -455,8 +454,8 @@ namespace DrumBuddy
             string action = InterfacePreferences.Resolve(key, System.Windows.Input.Keyboard.Modifiers);
             if (action == null) return;
             bool text = System.Windows.Input.Keyboard.FocusedElement is TextBox || System.Windows.Input.Keyboard.FocusedElement is ComboBox;
-            if (text && !new[] { "save", "saveAs", "open", "new", "settings" }.Contains(action)) return;
-            if (e.IsRepeat) { e.Handled = true; return; }
+            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;
             e.Handled = true; await ExecuteInterfaceAction(action);
         }
@@ -708,7 +707,7 @@ namespace DrumBuddy
         private void ShowHelp()
         {
             MessageBox.Show(window,
-                "AUDIO DEVICES\nUse Audio devices at the top of the app to choose playback output and recording input. Test speakers plays a short quiet tone. If Windows/Realtek playback fails, select that device's Compatibility (16-bit PCM) output. Save diagnostics exports device formats and recent playback errors. Windows microphones capture 16-bit PCM; use H5studio ASIO for native 32-bit float.\n\n" +
+                "AUDIO DEVICES\nUse Audio devices at the top of the app to choose playback output and recording input. Test speakers plays a short quiet tone. Windows default follows the current Windows speakers/headphones; named outputs select a specific device. Save diagnostics exports device formats and recent playback errors. Windows microphones capture 16-bit PCM; use H5studio ASIO for native 32-bit float.\n\n" +
                 "HOME AND CONVERTER\nOpen Converter from View or Home. Drop audio or video, choose an output type and click Convert files. WAV PCM, WAV float, AIFF, FLAC, MP3 and AAC copies are supported. Output settings can be resized, collapsed, or displayed on the side or bottom. The source is preserved.\n\n" +
                 "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" +
@@ -721,26 +720,33 @@ namespace DrumBuddy
                 "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" +
-                "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; K toggles the scissors pointer tool by default.\n\n" +
-                "Basic tools run locally without an account. This release is for Windows; macOS is planned.\n\nFlux 1.5.0 · FFmpeg + NAudio",
+                "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.1 · FFmpeg + NAudio",
                 "Flux — quick help",MessageBoxButton.OK,MessageBoxImage.Information);
         }
     }
 
     public static class Program
     {
+        [System.Runtime.InteropServices.DllImport("shell32.dll", CharSet = System.Runtime.InteropServices.CharSet.Unicode)]
+        private static extern int SetCurrentProcessExplicitAppUserModelID(string appId);
         [STAThread]
         public static int Main(string[] args)
         {
             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] == "--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());
+            if (args.Length > 0 && args[0] == "--tools-self-test") return EditorToolsTests.Run(args.Skip(1).ToArray());
             if (args.Length > 0 && args[0] == "--workspace-self-test") return WorkspaceTests.Run(args.Skip(1).ToArray());
             if (args.Length > 0 && args[0] == "--interface-self-test") return InterfaceTests.Run(args.Skip(1).ToArray());
             if (args.Length > 0 && args[0] == "--conversion-self-test") return ConversionTests.Run(args.Skip(1).ToArray());
             if (args.Length > 0 && args[0] == "--output-self-test") return PlaybackTests.Run(args.Skip(1).ToArray());
+            if (args.Length > 1 && args[0] == "--editor-playback-self-test") return EditorPlaybackTests.Run(args.Skip(1).ToArray());
             if (args.Length > 1 && args[0] == "--audio-diagnostics") { File.WriteAllText(args[1], AudioDiagnostics.Report(null), System.Text.Encoding.UTF8); return 0; }
             if (args.Length > 0 && args[0] == "--control-self-test") return ControlTests.Run(args.Skip(1).ToArray());
+            SetCurrentProcessExplicitAppUserModelID("ca.fluxtempo.Flux");
             var app = new Application { ShutdownMode = ShutdownMode.OnExplicitShutdown };
             app.DispatcherUnhandledException += delegate(object sender, DispatcherUnhandledExceptionEventArgs e) {
                 try { string folder = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),"DrumBuddy"); Directory.CreateDirectory(folder); File.AppendAllText(System.IO.Path.Combine(folder,"error.log"),DateTime.Now + " " + e.Exception + Environment.NewLine); } catch { }

package/source/Main.xaml

@@ -66,7 +66,9 @@
     </Style>
   </Window.Resources>
   <DockPanel Margin="16,10,16,10">
-    <Menu DockPanel.Dock="Top" Margin="-5,0,0,10" FontSize="13" Background="{DynamicResource ThemeF3F5F5}" Foreground="{DynamicResource Theme182C37}">
+    <Grid DockPanel.Dock="Top" Margin="0,0,0,6">
+      <Grid.RowDefinitions><RowDefinition Height="26" /><RowDefinition Height="36" /></Grid.RowDefinitions>
+    <Menu Margin="-5,0,0,0" FontSize="12" Background="{DynamicResource ThemeF3F5F5}" Foreground="{DynamicResource Theme182C37}">
       <MenuItem Header="_File">
         <MenuItem x:Name="FileNew" Header="New session" />
         <MenuItem x:Name="FileOpen" Header="Open session..." />
@@ -99,33 +101,28 @@
         <MenuItem x:Name="HelpGuide" Header="Quick help..." />
         <MenuItem x:Name="HelpAbout" Header="About Flux..." />
       </MenuItem>
-    </Menu>
-    <Grid DockPanel.Dock="Top" Margin="0,0,0,12">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition />
-        <ColumnDefinition Width="Auto" />
-      </Grid.ColumnDefinitions>
-      <StackPanel Orientation="Horizontal">
-        <Image x:Name="BrandLogo" Width="76" Height="58" Stretch="Uniform" Margin="0,0,12,0" />
-        <StackPanel VerticalAlignment="Center">
-          <TextBlock Text="Flux" FontSize="18" FontWeight="SemiBold" />
-          <TextBlock Text="Record / Edit / Convert" Foreground="{DynamicResource Theme526771}" FontSize="11" Margin="1,2,0,0" />
-        </StackPanel>
-      </StackPanel>
-      <StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
-        <Button x:Name="ThemeToggle" Content="Light theme" MinWidth="92" Margin="0,0,8,0" ToolTip="Switch between Dark and Light themes" />
-        <Button x:Name="AudioDevicesButton" Content="Audio devices" MinWidth="108" Margin="0,0,10,0" ToolTip="Choose speakers/headphones, recording input, and PCM compatibility playback." />
-        <Button x:Name="InstallDriversButton" Content="Install Drivers" MinWidth="112" Margin="0,0,10,0" ToolTip="Official Zoom H5studio and R16/R24 Windows driver setup." />
-        <Button x:Name="HelpButton" Content="Help" MinWidth="62" />
-      </StackPanel>
-    </Grid>
-    <WrapPanel DockPanel.Dock="Top" Orientation="Horizontal" Margin="0,0,0,10">
-      <Button x:Name="HomeTab" Content="Home" Width="88" Margin="0,0,8,6" />
-      <Button x:Name="RecordTab" Content="Record" Visibility="Collapsed" Width="90" Margin="0,0,12,0" />
-      <Button x:Name="MediaPlayerTab" Content="Media Player" Width="122" Margin="0,0,12,8" />
-      <Button x:Name="EditorTab" Content="Editor + Record" Width="140" Margin="0,0,12,8" />
-      <Button x:Name="ControlTab" Content="R16 Control" Width="115" Margin="0,0,0,8" />
-    </WrapPanel>
+    </Menu>
+      <Grid Grid.Row="1">
+        <Grid.ColumnDefinitions><ColumnDefinition Width="Auto" /><ColumnDefinition /><ColumnDefinition Width="Auto" /></Grid.ColumnDefinitions>
+        <StackPanel Orientation="Horizontal" Margin="0,0,14,0">
+          <Image x:Name="BrandLogo" Width="44" Height="34" Stretch="Uniform" Margin="0,0,5,0" />
+          <TextBlock Text="Flux" FontSize="15" FontWeight="SemiBold" VerticalAlignment="Center" />
+        </StackPanel>
+        <StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center">
+          <Button x:Name="HomeTab" Content="Home" MinHeight="26" Width="60" FontSize="12" Padding="7,2" Margin="0,0,4,0" />
+          <Button x:Name="RecordTab" Content="Record" Visibility="Collapsed" />
+          <Button x:Name="MediaPlayerTab" Content="Player" MinHeight="26" Width="64" FontSize="12" Padding="7,2" Margin="0,0,4,0" />
+          <Button x:Name="EditorTab" Content="Editor + Record" MinHeight="26" Width="116" FontSize="12" Padding="7,2" Margin="0,0,4,0" />
+          <Button x:Name="ControlTab" Content="R16 Control" MinHeight="26" Width="92" FontSize="12" Padding="7,2" />
+        </StackPanel>
+        <StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Center">
+          <Button x:Name="ThemeToggle" Content="Light" MinHeight="26" FontSize="12" Padding="8,2" Margin="0,0,5,0" ToolTip="Switch between dark and light themes" />
+          <Button x:Name="AudioDevicesButton" Content="Audio devices" MinHeight="26" FontSize="12" Padding="8,2" ToolTip="Select playback and recording devices" />
+          <Button x:Name="InstallDriversButton" Content="Install Drivers" Visibility="Collapsed" />
+          <Button x:Name="HelpButton" Content="Help" Visibility="Collapsed" />
+        </StackPanel>
+      </Grid>
+    </Grid>
     <Border x:Name="StatusHost" DockPanel.Dock="Bottom" Background="{DynamicResource ThemeF3F5F5}" BorderBrush="{DynamicResource ThemeDFE5E6}" BorderThickness="0,1,0,0" Padding="6,4" Margin="0,6,0,0" Visibility="Collapsed">
       <Grid>
         <Grid.ColumnDefinitions>

package/source/PlaybackTests.cs

@@ -44,8 +44,10 @@ namespace DrumBuddy
             var nativeFormat = new WaveFormatExtensible(48000, 32, 6);
             var exact = new EndpointWaveProvider(new Samples(new float[6], 48000, 6), nativeFormat);
             check(object.ReferenceEquals(exact.WaveFormat, nativeFormat), "Keep the exact native endpoint descriptor, including its speaker mask");
-            check(new OutputChoice { Compatibility = true }.Key == "compat:default" && new OutputChoice { Compatibility = true, EndpointId = "endpoint" }.Key == "compat:endpoint",
-                "Persist compatibility outputs separately from shared Windows and ASIO selections");
+            check(AudioOutputs.NormalizeKey("compat:default") == "default" && AudioOutputs.NormalizeKey("compat:endpoint") == "windows:endpoint",
+                "Migrate retired compatibility selections to the same real Windows endpoint");
+            check(WindowsAudioPlayer.Flags(true) == NAudio.CoreAudioApi.AudioClientStreamFlags.EventCallback && WindowsAudioPlayer.Flags(false) == NAudio.CoreAudioApi.AudioClientStreamFlags.None,
+                "Open an exact-mix shared stream without redundant Windows conversion flags");
             var mono = ReadAll(AudioOutputs.Adapt(new Samples(new[] { .25f, -.75f, 1.5f }, 44100, 1), 44100, 2));
             check(mono.SequenceEqual(new[] { .25f, .25f, -.75f, -.75f, 1f, 1f }), "Duplicate mono into both headphones and bound playback headroom");
             var stereo = ReadAll(AudioOutputs.Adapt(new Samples(new[] { .5f, -.25f, -1f, .5f }, 44100, 2), 44100, 2));
@@ -97,16 +99,20 @@ namespace DrumBuddy
         {
             string root = Path.GetFullPath(args.Length > 0 ? args[0] : Path.Combine(Path.GetTempPath(), "DrumBuddyOutput_" + Guid.NewGuid().ToString("N")));
             Directory.CreateDirectory(root); var log = new List<string>();
+            string oldLog = AudioOutputs.TestErrorLog; AudioOutputs.TestErrorLog = Path.Combine(root, "output-errors.txt");
             try {
-                var choices = new List<OutputChoice> { new OutputChoice { Name = "Windows default" }, new OutputChoice { Name = "Windows default compatibility", Compatibility = true } };
-                var named = AudioOutputs.Choices().FirstOrDefault(c => c.Compatibility && c.EndpointId != null);
+                var listed = AudioOutputs.Choices();
+                if (listed.Any(c => c.Name.IndexOf("Compatibility", StringComparison.OrdinalIgnoreCase) >= 0) || listed.Select(c => c.Key).Distinct().Count() != listed.Count) throw new Exception("Output choices contain synthetic or duplicate backend entries.");
+                log.Add("PASS  List Windows default and real endpoints without compatibility devices");
+                var choices = new List<OutputChoice> { listed.First(c => c.Key == "default") };
+                var named = listed.FirstOrDefault(c => c.EndpointId == choices[0].DefaultEndpointId);
                 if (named != null) choices.Add(named);
                 foreach (var choice in choices) foreach (int channels in new[] { 1, 2 }) {
                     using (var completed = new ManualResetEvent(false))
                     using (var route = AudioOutputs.Open(new Samples(new float[4410 * channels], 44100, channels), choice)) {
                         Exception error = null;
                         route.Player.PlaybackStopped += delegate(object sender, StoppedEventArgs e) { error = e.Exception; completed.Set(); };
-                        if (choice.Compatibility && !(route.Player is WaveOutEvent)) throw new Exception("Expected PCM compatibility playback.");
+                        if (!(route.Player is WindowsAudioPlayer)) throw new Exception("Expected native Windows shared playback.");
                         log.Add("Output: " + route.Description + ", " + route.Counter.WaveFormat.Channels + " channels");
                         route.Player.Play();
                         if (!completed.WaitOne(5000)) throw new Exception("Timed out while playing silent samples.");
@@ -116,7 +122,7 @@ namespace DrumBuddy
                     }
                 }
                 bool unavailable = false;
-                try { using (AudioOutputs.OpenCompatibility(new Samples(new float[4410], 44100, 1), new OutputChoice { Compatibility = true, EndpointId = "missing-endpoint-for-test" })) { } }
+                try { using (AudioOutputs.Open(new Samples(new float[4410], 44100, 1), new OutputChoice { EndpointId = "missing-endpoint-for-test" })) { } }
                 catch (IOException) { unavailable = true; }
                 if (!unavailable) throw new Exception("A missing selected endpoint was replaced by another output.");
                 log.Add("PASS  Refuse to route a missing explicitly selected endpoint to a different device");
@@ -129,6 +135,7 @@ namespace DrumBuddy
                 File.WriteAllLines(Path.Combine(root, "output-test-results.txt"), log, Encoding.UTF8); return 0;
             }
             catch (Exception ex) { log.Add("FAIL  " + ex); File.WriteAllLines(Path.Combine(root, "output-test-results.txt"), log, Encoding.UTF8); return 1; }
+            finally { AudioOutputs.TestErrorLog = oldLog; }
         }
     }
 }

package/source/Quick Start.txt

@@ -1,7 +1,10 @@
-FLUX 1.5.0
+FLUX 1.6.1
 
 INSTALL / UPDATE
 Close the app. Run npm.cmd install -g @pro-gram/flux@latest
+If npm skips its setup script, run flux --setup to finish the desktop install
+and create the Flux Desktop and Start menu shortcuts. With PowerShell scripts
+disabled, use flux.cmd --setup instead. First launch also completes setup.
 Launch flux.cmd, or the Flux Desktop shortcut.
 Migrating: npm.cmd uninstall -g @pro-gram/drumbuddy before installing Flux.
 Windows 10/11 x64 only in this release.
@@ -10,12 +13,24 @@ Macintosh support is planned.
 EDITOR + RECORD
 The Editor opens by default. Home contains the separate mini-app sections.
 File contains New, Open session, Save, Save as and Add audio.
+The compact header keeps navigation beside the logo. Grid and zoom share
+one toolbar; playback and the actual output device share the bottom strip.
+Export settings and extra range/import options expand when needed.
 Resize recording options by dragging the divider. Collapse hides its content;
 Show restores it. Its Side/Bottom selector changes the panel position.
 Add/drop audio, select time by dragging, then cut/copy/paste or split.
+V selects the normal pointer. Click a clip to select it; Shift-click selects
+additional clips. Selected items have purple fill and a bright border.
+Drag within audio to select a time range automatically. S splits at the playhead.
+Ctrl+Plus/Minus and Ctrl+mouse wheel zoom. Numeric-keypad +/- also work.
 Drag the ruler to place the playhead. The left edge snaps to exact zero.
 The thinner blue sticks mark selection start/end. Alt bypasses snapping.
-Range / zoom opens numeric selection and zoom controls.
+Range opens numeric selection controls.
+Zoom: use the visible - / + buttons and slider, or Ctrl+mouse wheel over audio.
+Wheel zoom keeps the time under the pointer in place. Shift+wheel pans sideways.
+Fit shows the full project; Selection fills the view with the selected range.
+Ctrl+= / Ctrl+- zoom; Ctrl+0 fits the project; Ctrl+Shift+0 fits the selection.
+Zoom can reveal individual samples. Close-up waveforms load in the background.
 Record options opens the sidebar. Select input, channels, rate and format.
 The take is saved at the playhead on the selected track; separate inputs use
 consecutive tracks. Stop saves and inserts it. Source files are preserved.
@@ -23,8 +38,9 @@ Use direct headphone monitoring. Software overdub synchronization is not include
 
 AUDIO DEVICES
 Audio devices at the top right opens Settings > Audio. Save device changes.
-For Realtek/shared-audio errors, select the same device's Compatibility
-(16-bit PCM) output. Test speakers plays a short quiet tone.
+Windows default shows and follows the current Windows speakers/headphones.
+Named outputs select the actual active device; there are no compatibility
+device entries. Test speakers plays a short quiet tone.
 Save diagnostics exports device information and recent playback errors.
 Playback buffer: 40-250 ms; increase it if audio breaks up.
 Windows microphones/Realtek/USB headsets receive 16-bit PCM. Saving that
@@ -39,6 +55,8 @@ General formats: PCM WAV, float WAV, AIFF, FLAC, MP3 and AAC/M4A.
 MP3 -> AIFF and AIFF -> WAV are supported. Gain tools are in Media Player.
 Choose source/44.1/48/96 kHz; MP3 uses at most 48 kHz.
 Conversion options resize, collapse and dock on the side or bottom.
+The installer includes FFmpeg with 227 audio decoders, including float/PCM WAV;
+import and conversion do not require Windows Media Player codec packs.
 The Zoom R16 preset writes classic 44.1 kHz PCM with compatible filenames.
 Existing sources and exports are never overwritten.
 
@@ -50,7 +68,11 @@ No discards changes. Duplicate bindings prevent saving until corrected.
 
 DEFAULT KEYS
 Space: play/pause or stop active recording. R: start/stop recording.
-Shift+Space: stop. S: split at playhead. K: click-to-split scissors tool.
+Shift+Space: stop. V: select pointer. S: split at playhead.
+Drag a clip header to move it; drag its left/right edges to trim it.
+Y: slip source contents. F: fade tool; selected clips also show fade handles.
+Ctrl+D: duplicate. Ctrl+L: repeat selected clips/range. M: clip mute. X: crossfade.
+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.
@@ -74,4 +96,4 @@ Editor BPM/division controls or Settings > Timeline / grid.
 Grid and clip-edge snapping are independent. Alt bypasses both.
 Tempo changes grid spacing without stretching audio. Save .dbedit to keep it.
 Ctrl+C, Backspace, position playhead, Ctrl+V. Copies survive deletion.
-Zoom to 2560 px/s for fine subdivisions; disable snap for free chops.
+Zoom into fine subdivisions or individual samples; disable snap for free chops.

package/source/SettingsWindow.cs

@@ -26,7 +26,7 @@ namespace DrumBuddy
         public SettingsWindow(Window owner, string category, bool audioLocked, Action<InterfaceSettings> persist = null, InterfaceSettings initial = null)
         {
             this.persist = persist ?? InterfacePreferences.Save;
-            Owner = owner; this.audioLocked = audioLocked; Title = "Flux - Settings";
+            Owner = owner; this.audioLocked = audioLocked; Title = "Flux - Settings"; Icon = BrandArtwork.Raster();
             Width = 930; Height = Math.Min(700, SystemParameters.WorkArea.Height - 40); MinWidth = 700; MinHeight = 460;
             FontFamily = owner == null ? new System.Windows.Media.FontFamily("Segoe UI") : owner.FontFamily; FontSize = 13; WindowStartupLocation = WindowStartupLocation.CenterOwner;
             ThemePalette.Install(this); draft = (initial ?? InterfacePreferences.Current).Copy(); saved = draft.Signature();
@@ -109,10 +109,11 @@ namespace DrumBuddy
         }
         private void ShowAudio()
         {
-            var panel = Page("Audio", "Choose output and recording input. Compatibility mode helps with Realtek or shared-audio API errors.");
+            var panel = Page("Audio", "Choose your actual speakers/headphones and recording input. Windows default follows your current Windows output.");
             panel.Children.Add(WorkspaceUi.Text("Speakers / headphones", 15));
             var outputs = AudioOutputs.Choices();
-            var output = new ComboBox { ItemsSource = outputs, SelectedItem = outputs.FirstOrDefault(c => c.Key == draft.AudioOutputKey), MinHeight = 34, FontSize = 13, Margin = new Thickness(0, 7, 0, 14), IsEnabled = !audioLocked };
+            var output = new ComboBox { ItemsSource = outputs, SelectedItem = outputs.FirstOrDefault(c => c.Key == draft.AudioOutputKey) ?? outputs[0], MinHeight = 34, FontSize = 13, Margin = new Thickness(0, 7, 0, 14), IsEnabled = !audioLocked };
+            draft.AudioOutputKey = ((OutputChoice)output.SelectedItem).Key;
             panel.Children.Add(output); output.SelectionChanged += delegate { var item = output.SelectedItem as OutputChoice; if (item != null) { draft.AudioOutputKey = item.Key; UpdateDirty(); } };
             panel.Children.Add(WorkspaceUi.Text("Recording input", 15)); var inputs = AudioInputs.Choices();
             var input = new ComboBox { ItemsSource = inputs, SelectedItem = inputs.FirstOrDefault(c => c.Key == draft.AudioInputKey), MinHeight = 34, FontSize = 13, Margin = new Thickness(0, 7, 0, 14), IsEnabled = !audioLocked };

package/source/Setup.cs

@@ -14,7 +14,7 @@ using System.Windows.Markup;
 using Microsoft.Win32;
 
 [assembly: AssemblyTitle("Flux Setup")]
-[assembly: AssemblyVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.6.1.0")]
 
 namespace DrumBuddySetup
 {
@@ -22,6 +22,8 @@ namespace DrumBuddySetup
     {
         public static readonly string InstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),"Programs","DrumBuddy");
         public const string RegistryKey = @"Software\Microsoft\Windows\CurrentVersion\Uninstall\DrumBuddy";
+        private static string BrandIcon { get { return Path.Combine(InstallPath,"Flux-" + Assembly.GetExecutingAssembly().GetName().Version.ToString(3) + ".ico"); } }
+        [System.Runtime.InteropServices.DllImport("shell32.dll")] private static extern void SHChangeNotify(uint eventId, uint flags, IntPtr item1, IntPtr item2);
         private static Window window;
         private static bool working, installed;
         private static T C<T>(string name) where T : FrameworkElement { return (T)window.FindName(name); }
@@ -42,6 +44,7 @@ namespace DrumBuddySetup
             var app = new Application();
             using (var s = Assembly.GetExecutingAssembly().GetManifestResourceStream("Setup.xaml")) window = (Window)XamlReader.Load(s);
             C<Image>("SetupLogo").Source = DrumBuddy.BrandArtwork.Raster();
+            window.Icon = DrumBuddy.BrandArtwork.Raster();
             window.Height = Math.Min(window.Height,SystemParameters.WorkArea.Height - 30);
             C<Button>("InstallButton").Click += async delegate {
                 if (installed) { LaunchApp(); window.Close(); return; }
@@ -98,7 +101,7 @@ namespace DrumBuddySetup
                     Directory.CreateDirectory(Path.GetDirectoryName(destination));
                     File.Copy(source,destination,true);
                 }
-                File.WriteAllText(Path.Combine(InstallPath,".drumbuddy-installed"),"Flux 1.5.0\n" + InstallPath,Encoding.UTF8);
+                File.WriteAllText(Path.Combine(InstallPath,".drumbuddy-installed"),"Flux 1.6.1\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");
@@ -109,13 +112,14 @@ 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.5.0"); key.SetValue("Publisher","Flux");
-                    key.SetValue("InstallLocation",InstallPath); key.SetValue("DisplayIcon",exe);
+                    key.SetValue("DisplayName","Flux"); key.SetValue("DisplayVersion","1.6.1"); 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);
                     long size = Directory.GetFiles(InstallPath,"*",SearchOption.AllDirectories).Sum(f => new FileInfo(f).Length);
                     key.SetValue("EstimatedSize",(int)(size / 1024));
                 }
+                SHChangeNotify(0x08000000,0,IntPtr.Zero,IntPtr.Zero);
             }
             finally { try { if (Directory.Exists(stage)) Directory.Delete(stage,true); } catch { } }
         }
@@ -180,7 +184,7 @@ namespace DrumBuddySetup
                     }
                     type.InvokeMember("TargetPath",BindingFlags.SetProperty,null,link,new object[] { exe });
                     type.InvokeMember("WorkingDirectory",BindingFlags.SetProperty,null,link,new object[] { Path.GetDirectoryName(exe) });
-                    type.InvokeMember("IconLocation",BindingFlags.SetProperty,null,link,new object[] { exe + ",0" });
+                    type.InvokeMember("IconLocation",BindingFlags.SetProperty,null,link,new object[] { BrandIcon + ",0" });
                     type.InvokeMember("Save",BindingFlags.InvokeMethod,null,link,null);
                 }
                 finally { System.Runtime.InteropServices.Marshal.FinalReleaseComObject(link); }

package/source/Third Party Notices.txt

@@ -1,4 +1,4 @@
-Flux 1.5.0 - third-party components
+Flux 1.6.1 - third-party components
 
 FFmpeg 9.0.2, release essentials build by Gyan Doshi
 Used as a separate command-line decoding process.
@@ -20,8 +20,9 @@ Copyright (c) .NET Foundation and Contributors. MIT license.
 https://github.com/dotnet/runtime/blob/main/LICENSE.TXT
 
 Zoom H5studio and R16/R24 drivers: linked from Zoom's official support pages, not bundled.
-R16 reference panel image: copyright Zoom Corporation. The npm installer
-fetches the image directly from Zoom's public product website.
+R16 reference panel image: copyright Zoom Corporation. The reference image
+is included from Zoom's public product website; its source URL and SHA-256
+are recorded in dependency-lock.json.
 Zoom and R16 are trademarks of Zoom Corporation. This is an independent app.
 
 The original drummer mascot was generated for Drum Buddy using OpenAI's