@pro-gram/flux 1.6.1 → 1.6.4

package/README.md

@@ -44,7 +44,7 @@ Editor opens by default. File contains New, Open session, Save, Save as and Add
 
 The compact header puts navigation beside the logo. Grid and zoom share one toolbar, and playback/output selection share the bottom strip. Export settings and extra range/import options expand when needed, keeping more tracks visible on smaller displays.
 
-The editor supports 16 tracks, multiple audio regions, selected/all-track edits, mute/solo, levels, split, cut/copy/paste, undo/redo, saved `.dbedit` sessions and PCM/float mix export. Original audio stays unchanged.
+The editor supports 16 tracks, multiple audio regions, selected/all-track edits, a live mixer, split, cut/copy/paste, undo/redo, saved `.dbedit` sessions and PCM/float mix export. Original audio stays unchanged.
 
 Select audio, press **Ctrl+C**, press **Backspace** to delete that section, place the playhead and press **Ctrl+V**. Deleting preserves the timeline gap and the internal audio clipboard. Delete is also available as an editable alternate; Ctrl+X still cuts. Paste starts exactly at the playhead. The Cut/Copy/Paste toolbar buttons are removed.
 
@@ -56,13 +56,27 @@ Drag a clip's header to move it; selected groups retain their time/track offsets
 
 Moves, trims, slip, clip mute and fades are non-destructive and undoable. Fades affect playback and exported mixes; splitting/copying inside a fade preserves the original envelope. Escape cancels a clip drag. The editor's select/slip/fade modes and all default commands have editable keybindings.
 
+**Ctrl+Left / Ctrl+Right** moves the playhead to the nearest bar line strictly left/right using the project tempo and time signature. From an exact bar line, it moves to the previous/next bar. Playback continues when jumping within the audio; a paused jump stays silent. **Enter** returns to the beginning, and **Home** remains available. These bindings appear in Settings > Keybinds. Text fields retain their normal editing keys.
+
+### Mixer
+
+Open **Mixer** from the editor toolbar or **View > Mixer**. Each of the 16 tracks has a **−60 to +24 dB fader**, numeric gain entry, pan/stereo balance, mute and solo. A pinned master strip provides **−60 to +12 dB gain**, mute and stereo output metering. Changes take effect while playback continues, support undo/redo, save with the session and apply to exported mixes. Original audio stays unchanged.
+
+**File peak** shows the loaded source level independently of mixer gain. Choose **Before fader** to inspect incoming track levels, including muted tracks, or **After fader** to see the adjusted signal. Stereo peak readouts turn red at 0 dBFS and stay latched until cleared. **Monitor** controls listening volume only; it changes neither exports nor mixer readings.
+
+During recording, the registered strips show the selected raw input channels. Set capture gain on the input device. The mixer changes playback/export levels after recording; use hardware direct monitoring during capture.
+
+Scroll across the tracks while the master remains visible. Resize the panel, choose Side/Bottom, or collapse it to recover timeline space.
+
 ### Editor zoom
 
 The visible **- / + buttons and slider** zoom the timeline from a full-project overview to individual samples. **Ctrl+mouse wheel** zooms around the time under the pointer; **Shift+wheel** scrolls sideways. **Fit** shows the full project, and **Selection** fills the pane with the selected time range.
 
 **Ctrl+Plus / Ctrl+Minus** zoom (including Ctrl+= and numeric-keypad keys), **Ctrl+0** fits the project and **Ctrl+Shift+0** fits the selection. These shortcuts are editable in Settings > Keybinds. At close zoom, waveform detail is read from decoded audio in the background, preserving positive/negative peaks and float headroom. The ruler displays fractional seconds when a close-up contains no labeled beat. Zoom changes the view without changing audio, the playhead or undo history.
 
-Record options contains microphone/input channels, sample rate and PCM/float format. Recording saves original takes and inserts them at the starting playhead on the selected track; separate input channels use consecutive tracks. Use hardware direct monitoring. Software overdub latency alignment is not included.
+Record options contains microphone/input channels, sample rate and PCM/float format. **Record** or **R** reserves the selected track (consecutive tracks for separate input files) and shows a one-bar countdown at the project tempo and time signature. The countdown displays the destination tracks and selected input. Press Record again, Stop, or Escape to cancel it before capture starts.
+
+After the final beat, capture starts through the selected input. A red playhead, growing recording highlights and elapsed timer follow the audio actually received. **Stop & save** preserves the original take and inserts it at the registered starting point; the playhead stays at the end of the take. Bar lines display **1, 2, 3**; detailed beat labels remain available when zoomed in. Use hardware direct monitoring. Software overdub latency alignment is not included.
 
 Recording controls, converter output settings and Media Player gain have draggable dividers, Collapse/Show and Side/Bottom positioning.
 
@@ -118,7 +132,8 @@ The Zoom R16 conversion preset writes classic 44.1 kHz 16/24-bit PCM WAV with sh
 | Save / save as | Ctrl+S / Ctrl+Shift+S |
 | Open / new session | Ctrl+O / Ctrl+N |
 | Import / export | Ctrl+I / Ctrl+E |
-| Start / end | Home / End |
+| Start / end | Enter or Home / End |
+| Previous / next bar | Ctrl+Left / Ctrl+Right |
 | Zoom in / out | Ctrl+= / Ctrl+- |
 | Fit project / selection | Ctrl+0 / Ctrl+Shift+0 |
 | Home / Editor / Converter / Player | Ctrl+1 / Ctrl+2 / Ctrl+3 / Ctrl+4 |

package/bin/flux.js

@@ -10,7 +10,7 @@ const { needsUpdate } = require('../scripts/version.js');
   const arg = process.argv[2];
   if (arg === '--version' || arg === '-v') { console.log(pkg.version); return; }
   if (arg === '--help' || arg === '-h') {
-    console.log('Flux ' + pkg.version + ' for Windows\n\nflux             Open Flux\nflux --setup     Install or repair Flux\nflux --audio-diagnostics  Save an audio device report\nflux --version   Show the npm package version\n\nAudio: H5studio native 32-bit float recording; 16/24-bit PCM recording and export.\nWindows/Realtek/USB microphones use 16-bit PCM input.\nWorkspaces: PCM/float Media Player and 16-track timeline Editor with recording.\nTempo grid: BPM, time signatures, 1/1 to 1/256 subdivisions, triplets and independent grid/edge snapping.\nCtrl+C copies; Backspace deletes selection; Ctrl+V pastes at the playhead.\nDark/light themes, Converter and editable keybind settings.\nUpdate: close Flux, then npm.cmd install -g @pro-gram/flux@latest\nRun flux.cmd afterward to finish setup if npm skipped the install script.'); return;
+    console.log('Flux ' + pkg.version + ' for Windows\n\nflux             Open Flux\nflux --setup     Install or repair Flux\nflux --audio-diagnostics  Save an audio device report\nflux --version   Show the npm package version\n\nAudio: H5studio native 32-bit float recording; 16/24-bit PCM recording and export.\nWindows/Realtek/USB microphones use 16-bit PCM input.\nWorkspaces: PCM/float Media Player and 16-track timeline Editor with recording.\nRecording: one-bar visual count-in, reserved input tracks and a moving recording playhead.\nTempo grid: BPM, time signatures, 1/1 to 1/256 subdivisions, triplets and independent grid/edge snapping.\nCtrl+C copies; Backspace deletes selection; Ctrl+V pastes at the playhead.\nDark/light themes, Converter and editable keybind settings.\nUpdate: close Flux, then npm.cmd install -g @pro-gram/flux@latest\nRun flux.cmd afterward to finish setup if npm skipped the install script.'); return;
   }
   if (process.platform !== 'win32' || process.arch !== 'x64') throw new Error('Flux needs Windows x64.');
   const root = installRoot();

package/dependencies.json

@@ -1,15 +1,15 @@
-{
-  "ffmpeg": {
-    "url": "https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-9.0.2-essentials_build.zip",
-    "file": "ffmpeg-9.0.2.zip",
-    "sha256": "60f467265b1e312373dbcd92200c2618a74850f98d3d078e94296bb3fa2047ba"
-  },
-  "panel": {
-    "url": "https://zoomcorp.com/media/original_images/R16_list_0.png",
-    "file": "r16-panel.png",
-    "sha256": "315a71e8942a445c903b2d1aedb703b64aab30f054e46199a2bac447d3d03cb2",
-    "alternateSha256": "5564fa622f101dc27ea402c399c5b9b1e1e039b8771daf40b185dab9772adf38"
-  },
-  "installerSha256": "3d36d86c4bc3e83276811a59778c2fc0e3fe7368dcb6b0ecbc7658ea99220929",
-  "bundledAssets": true
-}
+{
+  "ffmpeg": {
+    "url": "https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-9.0.2-essentials_build.zip",
+    "file": "ffmpeg-9.0.2.zip",
+    "sha256": "60f467265b1e312373dbcd92200c2618a74850f98d3d078e94296bb3fa2047ba"
+  },
+  "panel": {
+    "url": "https://zoomcorp.com/media/original_images/R16_list_0.png",
+    "file": "r16-panel.png",
+    "sha256": "315a71e8942a445c903b2d1aedb703b64aab30f054e46199a2bac447d3d03cb2",
+    "alternateSha256": "5564fa622f101dc27ea402c399c5b9b1e1e039b8771daf40b185dab9772adf38"
+  },
+  "installerSha256": "c30e7d28feca44ba1116d70e2cd1a66443b5fbf2296d3a800ec59320d75c0a77",
+  "bundledAssets": true
+}

package/package.json

@@ -1,60 +1,61 @@
-{
-  "name": "@pro-gram/flux",
-  "version": "1.6.1",
-  "description": "Flux: a 16-track Windows audio studio with native shared playback, float/PCM recording, clip editing tools, tempo grids and bundled audio codecs.",
-  "license": "MIT",
-  "author": "pro-gram",
-  "os": [
-    "win32"
-  ],
-  "cpu": [
-    "x64"
-  ],
-  "engines": {
-    "node": ">=18"
-  },
-  "bin": {
-    "flux": "bin/flux.js"
-  },
-  "scripts": {
-    "postinstall": "echo If npm skips setup, run flux --setup && node scripts/install.js",
-    "test": "node --test test/*.test.js"
-  },
-  "files": [
-    "bin/flux.js",
-    "scripts/",
-    "test/",
-    "payload/DrumBuddy-Setup.exe",
-    "dependencies.json",
-    "source/",
-    "LICENSE",
-    "NOTICE.txt"
-  ],
-  "keywords": [
-    "audio-editor",
-    "media-player",
-    "multitrack",
-    "zoom-h5studio",
-    "32-bit-float",
-    "pcm",
-    "zoom-r16",
-    "drums",
-    "audio",
-    "midi",
-    "wav",
-    "windows",
-    "recording",
-    "fluxtempo",
-    "realtek",
-    "audio-workstation",
-    "flux",
-    "tempo-grid",
-    "beat-grid",
-    "snap-to-grid"
-  ],
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "homepage": "https://fluxtempo.ca"
-}
+{
+  "name": "@pro-gram/flux",
+  "version": "1.6.4",
+  "description": "Flux: a 16-track Windows audio studio with a live mixer, float/PCM recording, clip editing, tempo grids and bundled audio codecs.",
+  "license": "MIT",
+  "author": "pro-gram",
+  "os": [
+    "win32"
+  ],
+  "cpu": [
+    "x64"
+  ],
+  "engines": {
+    "node": ">=18"
+  },
+  "bin": {
+    "flux": "bin/flux.js"
+  },
+  "scripts": {
+    "postinstall": "echo If npm skips setup, run flux --setup && node scripts/install.js",
+    "test": "node --test test/*.test.js"
+  },
+  "files": [
+    "bin/flux.js",
+    "scripts/",
+    "test/",
+    "payload/DrumBuddy-Setup.exe",
+    "dependencies.json",
+    "source/",
+    "LICENSE",
+    "NOTICE.txt"
+  ],
+  "keywords": [
+    "audio-editor",
+    "media-player",
+    "multitrack",
+    "zoom-h5studio",
+    "32-bit-float",
+    "pcm",
+    "zoom-r16",
+    "drums",
+    "audio",
+    "midi",
+    "wav",
+    "windows",
+    "recording",
+    "fluxtempo",
+    "realtek",
+    "audio-workstation",
+    "flux",
+    "tempo-grid",
+    "beat-grid",
+    "snap-to-grid",
+    "mixer"
+  ],
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "homepage": "https://fluxtempo.ca"
+}

package/payload/DrumBuddy-Setup.exe

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/payload/DrumBuddy-Setup.exe
-size: 42842624 bytes
-sha256: 3d36d86c4bc3e83276811a59778c2fc0e3fe7368dcb6b0ecbc7658ea99220929
+size: 41809920 bytes
+sha256: c30e7d28feca44ba1116d70e2cd1a66443b5fbf2296d3a800ec59320d75c0a77

package/source/AssetBootstrap.cs

@@ -21,7 +21,7 @@ namespace DrumBuddySetup
             if(File.Exists(target) && expected.Contains(Hash(target),StringComparer.OrdinalIgnoreCase))return target;
             string temporary=target+"."+Guid.NewGuid().ToString("N")+".partial";
             try {
-                using(var client=new WebClient()) { client.Headers[HttpRequestHeader.UserAgent]="DrumBuddy/1.6.1";client.DownloadFile(url,temporary); }
+                using(var client=new WebClient()) { client.Headers[HttpRequestHeader.UserAgent]="DrumBuddy/1.6.4";client.DownloadFile(url,temporary); }
                 if(!expected.Contains(Hash(temporary),StringComparer.OrdinalIgnoreCase))throw new IOException("A downloaded component failed its integrity check. Please retry setup or obtain a newer Drum Buddy release.");
                 File.Copy(temporary,target,true);return target;
             }finally { if(File.Exists(temporary))File.Delete(temporary); }

package/source/Audio Decoders.txt

@@ -1,4 +1,4 @@
-Flux 1.6.1 bundled FFmpeg audio decoders
+Flux 1.6.4 bundled FFmpeg audio decoders
 These decode imported files without Windows Media Player codecs.
 
  A..... = Audio

package/source/Audio.cs

@@ -282,6 +282,7 @@ namespace DrumBuddy
         private Task writing;
         private readonly object gate = new object();
         private bool accepting;
+        private Action beginCapture;
         private int captureChannels, selectedInput, savedChannels;
         private bool separate, requireFloatInput;
         private readonly List<IRecordingWriter> writers = new List<IRecordingWriter>();
@@ -300,18 +301,27 @@ namespace DrumBuddy
 
         public void Start(InputChoice input, int mode, int bits, string folder, int rate)
         {
-            if (input.Driver != null) { Start(input.Driver, mode, bits, folder, rate); return; }
+            Prepare(input, mode, bits, folder, rate); BeginCapture();
+        }
+
+        // Prepare drivers on the UI thread before the count-in, without capturing audio
+        // or creating a take. ASIO COM objects must stay on this thread.
+        public void Prepare(InputChoice input, int mode, int bits, string folder, int rate)
+        {
+            if (input == null) throw new ArgumentNullException("input");
+            if (device != null || windowsInput != null || queue != null || beginCapture != null) throw new InvalidOperationException("This recorder is already prepared.");
+            if (input.Driver != null) { PrepareAsio(input.Driver, mode, bits, folder, rate); return; }
             try {
                 windowsChannels = AudioInputs.Channels(input);
                 var layout = CaptureLayout.Create(windowsChannels, mode);
+                captureChannels = layout.Channels;
                 windowsInput = new WaveInEvent { DeviceNumber = AudioInputs.Device(input), WaveFormat = new WaveFormat(rate, 16, windowsChannels), BufferMilliseconds = 50, NumberOfBuffers = 3 };
-                StartBuffered(layout, bits, folder, rate, false);
                 SourceFormat = "Windows 16-bit PCM"; SourceIsFloat = false;
                 windowsInput.DataAvailable += delegate(object sender, WaveInEventArgs e) { ProcessWindowsPcm(e.Buffer, e.BytesRecorded, windowsChannels); };
                 windowsInput.RecordingStopped += delegate(object sender, StoppedEventArgs e) {
                     lock (gate) { if (accepting && Error == null) Error = e.Exception ?? new IOException("The microphone stopped. Check its connection and Windows microphone permissions."); }
                 };
-                windowsInput.StartRecording();
+                beginCapture = delegate { StartBuffered(layout, bits, folder, rate, false); windowsInput.StartRecording(); };
             }
             catch { Stop(); throw; }
         }
@@ -341,19 +351,30 @@ namespace DrumBuddy
         }
 
         public void Start(string driver, int mode, int bits, string folder, int rate)
+        { Start(new InputChoice { Driver = driver, Name = driver }, mode, bits, folder, rate); }
+
+        public void BeginCapture()
+        {
+            var start = beginCapture;
+            if (start == null) throw new InvalidOperationException("Prepare a recording input before starting capture.");
+            beginCapture = null;
+            try { start(); } catch { Stop(); throw; }
+        }
+
+        private void PrepareAsio(string driver, int mode, int bits, string folder, int rate)
         {
             try {
                 device = new AsioOut(driver);
                 var layout = CaptureLayout.Create(device.DriverInputChannelCount, mode);
+                captureChannels = layout.Channels;
                 if (!device.IsSampleRateSupported(rate)) throw new IOException("This device does not support " + rate + " Hz in its current mode. Choose a supported rate, or set the recorder to Audio I/F Only.");
                 device.InputChannelOffset = layout.FirstInput;
                 device.InitRecordAndPlayback(null, layout.Channels, rate);
-                StartBuffered(layout, bits, folder, rate, bits == 32 && CaptureLayout.IsH5studio(driver));
                 device.AudioAvailable += Captured;
                 device.PlaybackStopped += delegate(object sender, StoppedEventArgs e) {
                     lock (gate) { if (accepting && Error == null) Error = e.Exception ?? new IOException("The recording device stopped sending audio. Check its USB connection."); }
                 };
-                device.Play();
+                beginCapture = delegate { StartBuffered(layout, bits, folder, rate, bits == 32 && CaptureLayout.IsH5studio(driver)); device.Play(); };
             }
             catch { Stop(); throw; }
         }
@@ -427,6 +448,7 @@ namespace DrumBuddy
         // Call on the UI thread: ASIO COM objects have thread affinity.
         public void Stop()
         {
+            beginCapture = null;
             lock (gate) accepting = false;
             if (windowsInput != null) {
                 try { windowsInput.StopRecording(); } catch (Exception ex) { if (Error == null) Error = ex; }

package/source/Build Instructions.txt

@@ -1,4 +1,4 @@
-FLUX SOURCE (DRUM BUDDY COMPATIBLE UPDATE)
+FLUX SOURCE
 
 Build on Windows 10/11 x64 with .NET Framework 4.8.
 No Visual Studio or .NET SDK is required: Build.ps1 uses the C# compiler
@@ -18,6 +18,8 @@ Verification:
   DrumBuddy.exe --tools-self-test "C:\path\to\new-tool-test-folder"
   DrumBuddy.exe --workspace-self-test "C:\path\to\new-editor-test-folder"
   DrumBuddy.exe --float-self-test "C:\path\to\new-float-test-folder"
+  DrumBuddy.exe --mixer-self-test "C:\path\to\new-mixer-test-folder"
+  DrumBuddy.exe --recording-self-test "C:\path\to\new-recording-test-folder"
   DrumBuddy.exe --output-self-test "C:\path\to\new-output-test-folder"
   DrumBuddy.exe --editor-playback-self-test "C:\path\to\new-playback-test-folder"
   DrumBuddy.exe --interface-self-test "C:\path\to\new-interface-test-folder"
@@ -40,6 +42,12 @@ exposed. The output suite queries microphone formats without opening capture.
 The editor-playback suite imports float/PCM files and exercises the actual
 editor transport with muted listening, plus native pause/resume/drain checks.
 Windows microphone buffer tests cover routing, saved samples and queue draining.
+The recording suite covers count-in timing/cancellation, frozen input and track
+routing, captured-frame playhead progress, recording visuals, take insertion
+and preserved originals using generated input buffers.
+The mixer suite checks live track/master gain, pan, mute/solo, source/output
+meters, session compatibility, undo, exported levels and dark/light layouts.
+It exercises native playback with the monitor volume at zero.
 The interface suite checks keybind capture, saved/unsaved settings, theme
 switching, integrated recording insertion and dark/light/compact layouts.
 The general-conversion suite checks original-rate float/PCM WAV, FLAC,

package/source/Build.ps1

@@ -100,6 +100,8 @@ $appArgs += Join-Path $PSScriptRoot 'EditorSelectionTests.cs'
 $appArgs += @('EditorTools.cs','EditorToolInteractions.cs') | ForEach-Object { Join-Path $PSScriptRoot $_ }
 $appArgs += Join-Path $PSScriptRoot 'EditorToolsTests.cs'
 $appArgs += Join-Path $PSScriptRoot 'EditorCompactLayout.cs'
+$appArgs += @('RecordingSession.cs','EditorRecording.cs','RecordingTests.cs') | ForEach-Object { Join-Path $PSScriptRoot $_ }
+$appArgs += @('TimelineMixer.cs','EditorMixer.cs','EditorMixerTests.cs') | ForEach-Object { Join-Path $PSScriptRoot $_ }
 & $compiler @appArgs
 if ($LASTEXITCODE -ne 0) { throw 'App compilation failed.' }
 $iconVersion = [Reflection.AssemblyName]::GetAssemblyName((Join-Path $package 'DrumBuddy.exe')).Version.ToString(3)
@@ -119,7 +121,11 @@ if (Test-Path -LiteralPath $payload) { Remove-Item -LiteralPath $payload }
 [IO.Compression.ZipFile]::CreateFromDirectory($package,$payload,[IO.Compression.CompressionLevel]::Optimal,$false)
 $manifest = Get-ChildItem -LiteralPath $package -Recurse -File | ForEach-Object {
     $relative = $_.FullName.Substring($package.Length + 1).Replace('\','/')
-    (Get-FileHash -LiteralPath $_.FullName -Algorithm SHA256).Hash + '  ' + $relative
+    $payloadStream = [IO.File]::OpenRead($_.FullName)
+    $payloadHasher = [Security.Cryptography.SHA256]::Create()
+    try { $payloadHash = [BitConverter]::ToString($payloadHasher.ComputeHash($payloadStream)).Replace('-','') }
+    finally { $payloadStream.Dispose(); $payloadHasher.Dispose() }
+    $payloadHash + '  ' + $relative
 }
 $manifestPath = Join-Path $BuildFolder 'payload.sha256'
 [IO.File]::WriteAllLines($manifestPath,[string[]]$manifest,(New-Object Text.UTF8Encoding($false)))

package/source/EditorCompactLayout.cs

@@ -26,7 +26,7 @@ namespace DrumBuddy
             play.MinWidth = 52;
             foreach (var button in transport.Children.OfType<Button>()) { button.FontSize = 12; button.MinHeight = 26; button.Padding = new Thickness(6, 2, 6, 2); button.Margin = new Thickness(0, 0, 4, 4); }
             positionText.FontSize = 12; positionText.Margin = new Thickness(3, 0, 9, 4); volume.Width = 80; volume.Margin = new Thickness(0, 0, 8, 4);
-            foreach (var text in transport.Children.OfType<TextBlock>().Where(t => t != positionText)) { text.FontSize = 12; if (text.Text.StartsWith("Listen")) text.Text = "Volume "; }
+            foreach (var text in transport.Children.OfType<TextBlock>().Where(t => t != positionText)) { text.FontSize = 12; if (text.Text.StartsWith("Monitor")) text.Text = "Monitor "; }
             bottom.Children.Remove(outputPicker); outputPicker.UseCompactLayout(); transport.Children.Add(outputPicker);
             selectionText.FontSize = 11; selectionText.MaxWidth = 220; selectionText.Margin = new Thickness(5, 0, 0, 4); transport.Children.Add(selectionText);
             foreach (var control in exports.Children.OfType<Control>()) { control.FontSize = 12; control.MinHeight = 26; control.Margin = new Thickness(0, 0, 8, 3); }