Skip to content

Vocal Throw M11 — full M1–M10 DSP/GUI reconciled with ArSon Player M2 main - #497

Merged
19 commits merged into
mainfrom
integration/arson-vocal-throw-m6-player-20261109
Nov 10, 2026
Merged

19 commits merged into
mainfrom
integration/arson-vocal-throw-m6-player-20261109

Conversation

@masarray

@masarray masarray commented Nov 9, 2026 •

Copy link
Copy Markdown
Owner

Milestone: source-integrated Vocal Throw M1–M6 without reverting Player

Parent: current main d46aaa6b18ce94f5908c5db4f33ccba7d69947b4 (merged ArSon Player). Source feature: M6 PR #495 head fea39dd95a3099865b20641f63d57c91d11d4820 stacked on M1–M5 #494.

This branch commits the complete 31-file Vocal Throw source delta on a NEW descendant of latest main. All six files also changed by the newest Player commit were reconstructed with verified line-level 3-way merge against common base 381c1402, rather than overwriting Player implementation: CMakeLists.txt, src/Main.cpp, src/LiveAudioEngine.h, src/LiveDryRoutingLab.h, engine/core/DynamicNativeSessionPublisher.h, and site/preview-v2/assets/mixer-contextual-buttons.css. Their independently derived diff sets did not overlap and reconstruct each input exactly. The remaining 25 M6 paths were copied by exact Git object SHA; no older feature branch was reset, deleted or force-pushed.

Native source, tempo estimator, beat-phase grid, performer-facing SVG hardware editor, readback M6, authoritative JUCE ChannelId FX and tests are preserved. All latest-main Player virtual PCM, decoder, setlist, UI, session state and CMake test targets remain in the parent/main state.

Quality gates: fast native & UI contracts on exact SHA, source-level CMake/contract review, one exact-SHA manual Windows JUCE/MSVC CTest and focused desktop/mobile Chromium FAT before marking ready. GitHub PR status success may only mean fast jobs passed: expensive Windows and Chromium jobs are conditionally SKIPPED on PRs. No physical ASIO certification or release claim without actual hardware test (music bus, singer microphone, no xrun, 44.1/48/96 kHz, 64/128 frames).

Safety: Draft; do not auto-merge or package as public release. Keep #494/#495 as immutable provenance. Existing Player/Harmony/Compressor/ASIO fixes must remain intact.

Follow-up acceptance and handoff: issue #473.

M7 P0 source-stall correction (commit 1aaae66a)

  • Reproduced an architectural stale-clock condition: with no new callback frames, tick-only expiry cannot revoke a previously accepted MUSIC beat lock.
  • NativeMusicTempoMonitor::poll now uses CONTROL-only monotonic age to invalidate BPM and beat phase after 3.5 seconds of absent accepted MUSIC PCM, while retaining the selected ChannelId for natural fresh relock. No clock reads or allocations were introduced into ASIO render.
  • New deterministic stoppedAudioCallbackMustRevokeOldBeat tests 2.45-second holdover, 3.5-second expiry with zero audio callbacks, and 120-BPM reacquisition using new PCM on the same source.

Evidence at exact M7 HEAD

  • Fast native contracts: PASS (run #42626463332). PR Windows job: skipped by repository's intentional PR gate, NOT a CTest pass.
  • Fast UI contracts and real desktop/mobile Vocal Throw Chromium FAT: PASS (run #42626463348, screenshots artifact).
  • Owner-authenticated exact-SHA native dispatch requested via PR command. Windows MSVC/JUCE CTest run #42626656889 was in progress at last inspection. Do not claim native CTest passed until the job and all tests are actually successful.
  • Physical ASIO singer/music synchronization, real hardware monitoring, xrun/PDC and release packaging are not qualified by these automated checks.

Integration head: 1aaae66a85c20efca77f2ffa55564b37a7192ca0 (main parent d46aaa6b18ce94f5908c5db4f33ccba7d69947b4). Branch stays DRAFT; not merged.

M8 — expired-cue safety + deterministic octave re-lock (9e7caf8)

Additional P0 found during live audit: a UI-rejected 3s timeout could leave a throw- command in the audio SPSC. When the callback resumed, the old cue could still sound late, and the next request could accidentally consume an older completion. Now CONTROL marks expired request IDs canceled, AUDIO rejects matching queued commands before playback, the host drains a bounded number of stale completions, matches exact IDs, and returns typed timeout ACK. No clocks/heap/locks/spin in the callback. New real JUCE processor lifecycle test NativeVocalThrowExpiredCueCancellation covers canceled settings, canceled live cue, and subsequent fresh accepted cue.

Exact M7 Windows evidence corrected: run 42626656889 actually built successfully but 71/72 CTest, with NativeMusicTempoSourceOnsetsAndFallback RED at weak hi-hat → genuine 120 BPM relock. This was NOT a passed Windows qualification.

Root cause and fix: a half-time false incumbent at 60 BPM survived indefinitely because a true 120 BPM onset train also supports multiples of 60. In MusicTempoEstimator, octave hysteresis now permits a challenger only when the CONTROL-owned last-6-second window contains at least six strong consecutive direct-period onset matches, visibly stronger than the incumbent, while preserving 3-scan / 6-scan hysteresis and distinct BPM vs phase confidence. Ambiguous offbeat/sparse music retains the prior BPM; no FFT or new callback work.

Cheap deterministic regression gate: added selective GCC C++20 portable beat re-lock + VocalThrow core tests to fast native PR checks (no JUCE checkout). Exact current fast-native CI 42631025368 PASS, including 72/95/120/160, weak percussion release/relock, phase ambiguity and no callback allocations. The new JUCE expiration target still requires Windows.

GUI regression: Chromium 42631025358 PASS including actual Vocal Throw editor desktop/mobile; screenshots/artifact.

Exact-SHA Windows MSVC/JUCE CTest is requested automatically via PR CI command, running as 42631243077. Do not claim full Windows PASS until all CTests finish. Physical ASIO singer/music/latency/xrun qualification still outstanding. PR remains Draft; no merge or installer promotion.

M8.1 — bounded multi-timeout cancellation (c9d8d6f)

Source-review follow-up: a single last-cancelled ID is insufficient if two or more control intents time out while ASIO remains suspended; the second cancellation would un-cancel the first queued cue. Replaced it with a 32-entry, fixed-size atomic cancellation ring, matching the bounded 32-entry command FIFO. CONTROL writes retired request IDs; AUDIO scans at most 32 atomics only when consuming a queued edit, never per sample. No heap, clock, wait, spin or mutex in audio. Updated tests/native_vocal_throw_cancel_test.cpp with two consecutive expired settings intents, then a new accepted setting and later valid singer cue.

Current exact branch c9d8d6f207e92c443dded458a9504d0de3c204ed, mergeable against main d46aaa6b, Draft. Fast native 42631714534 PASS (includes portable BPM/DSP no-heap); UI Chromium 42631714428 PASS. The prior manual Windows run 42631243077 is for earlier SHA 9e7caf8, not current c9d8d6f, and cannot qualify the latest ring change even if green. Avoid redundant concurrent Windows builds; exact current-SHA Windows MSVC/JUCE CTest and physical ASIO field qualification remain pending. No main merge or installer release.

M8.2–M8.3 — restart-persistent DSP and OFF/re-enable performer cue safety (HEAD a6943c74)

M8.2 applied-DSP restart: VocalThrowProcessor::prepareToPlay now stages the last truly AUDIO-applied settings from the stopped DSP core rather than replaying a potentially stale CONTROL ACK shadow. Cold Show restore still takes the staged preset. Old-rate still-queued PreparedEdit is rejected on new rate, followed by a genuine fresh-rate acceptance. An expanded real JUCE processor test verifies pending unpolled ACK, 44.1/48/96 kHz restart, 128/257 frame buffers, real stereo echo PCM against the standalone VocalThrow core, and cold Show restore.

M8.3 bypass cue fail-closed: LiveChannelFxGraph now gives built-in RT controls a no-op-by-default, callback-only bypass notification. Vocal Throw uniquely rejects singer THROW while its insert or whole FX rack is OFF. Keep settings edits effective while bypassed. On full OFF or re-enable, invalidate the now-stale vocalist history and pending tails in constant time (no vector wipe, heap, waiting, second renderer or RT wall-clock). Fade-out retains its intended transition until fully bypassed. This prevents a singer cue from sounding late after a long OFF period or fast toggle. ACK explicitly reports FX_BYPASSED_THROW_DISABLED. New JUCE fixture covers fade-out, OFF settings ACK, OFF cue rejection, stale capture rejection after ON, fresh phrase accepted. Other native FX default behavior unchanged.

Evidence for exact M8.3 SHA: Fast native portable DSP/beat-relock and source contracts run 42634746416 PASS (expensive Windows intentionally skipped on PR); actual desktop/mobile Vocal Throw Chromium run 42634746480 PASS. Previous exact-SHA Windows native 42631243077 73/73 CTest PASS for earlier 9e7caf8f, NOT these new source changes. Latest Windows JUCE/CTest and physical ASIO certification not yet proven; do not merge, release, or claim hardware sound quality based on static checks.

Exact M8.3 FAT/installer verification requested: owner-comment /arsonmix-ci fat a6943c7486d1f32752d3fd22d049ac31b2dcac5e created manual run 42635330166. The job was queued at request time. It must pass its full Windows CTest, native GUI/provenance checks, ZIP integrity and installer verification before any new artifact is eligible for physical singer/ASIO trial. Artifact absence is not release success. Latest actual desktop/mobile screenshots.

M9 — Vocal Throw visual alignment audit and responsive faceplate (b018ec6)

Source visual evidence: inspected actual Chromium native-approved /preview/ editor screenshots from run 42634746480 at 1366x768 and 390x844 before modifying any layout. Problems: extremely small 8px hardware captions; encoder captions/value/knob baselines spread unevenly; MIX and MODE modules lacking a common optical centerline; LCD/TAP differing heights; compressed rhythm/music labels/selects; header identity wasted available portrait width; footer on 390px viewport initially clipped when text was enlarged. Kept approved SVG encoder, 260° meter arc, centered singer THROW image/button, native FX power/close, and single approved renderer.

Implementation: reworked only the Vocal Throw section of the authoritative site/preview-v2/assets/mixer-fx-rack.css with repeatable 3-row caption/rotary/value grid, symmetric three-encoder banks, readable 9–12px captions/values, stable 88px MIX / center MODE / 302px tempo desktop columns, identical-height LCD and TAP, taller/selectable RHYTHM and MUSIC controls, correctly spaced status rail. Responsive @740 and @600 CSS uses grid cells rather than arbitrary tiny fonts, portrait THROW ≥160px, wider channel text space and bounded portrait layout. No new duplicate CSS owner, JS UI mode, DSP edit, or second native audio path.

Fail-closed visual QA: tests/approved_native_vocal_throw_smoke.py now renders approved native WebView asset output in real Chromium at 1366×768, 650×720, and 390×844; checks every encoder label/rotary/value shares its X axis, the six knobs form level aligned banks, labels are ≥9px and unclipped, MIX and MODE vertical centers agree, RHYTHM/MUSIC labels match desktop baselines, LCD and TAP centers differ <3px, the 390px footer stays in view and there is no horizontal overflow. Existing tests still verify exact native insert picker, power/close, ACK/readback, SVG artwork, knob motion, and manual cue.

Confirmed on current exact SHA: Chromium UI + geometry run 42658899787 PASS, screenshots (1366, 650, 390). Fast native contracts 42658900075 PASS, full Windows job SKIPPED by draft PR policy. This is visual/interface qualification only, NOT hardware audio or release proof.

Concurrent main drift: main advanced from d46aaa6b to 9bd81a1b (Player M2) during this work. PR remained GitHub mergeable, with no changes in main to the Vocal Throw CSS or Chromium visual test paths. Integration with that newer Player main should still be rechecked before final merge/installer promotion. PR stays Draft; do not silently merge or claim released.

M10 — replace physical THROW artwork with owner-supplied tombol_ungu.svg (HEAD 9ff9d6ab)

The physical singer cue retains its same #vtThrow native button, JUCE event, zero DSP change, aria label, disabled state, accessibility, hover, press and live-tail behavior. Replaced only the canonical site/preview-v2/assets/arson-vocal-throw-performance.svg with the owner's glossy graphite pushbutton and illuminated magenta-purple ring. The supplied SVG's 327×327 original artwork, nested data-URI PNG, gradient surfaces and circle geometry are retained. The unnecessary SVG 1.1 remote DOCTYPE and unused Serif namespace are dropped for self-contained WebView2 use; width/height are explicit 327 to match the declared viewBox. No new CSS owner or second frontend.

Replaced obsolete old-Illustrator/WebP hard-coded test assumptions with SVG XML validation, embedded PNG signature/size and forbidden external hrefs. Existing native UI test still verifies the actual installed backgroundImage, one physical cue button, all seven rotaries, disabled/readback/trigger behavior, responsive layout and screenshot at 1366×768, 650×720 and 390×844. The small THROW chassis engraving is shifted visually away from the new ring via a compositor-only translateY without increasing the portrait panel height.

Verification: Chromium UI on exact asset commit 4fe43759 PASS and purple button screenshot artifacts visibly show the user button in 1366px/650px/390px approved native GUI. Native quick contracts PASS; Windows CTest intentionally skipped on draft PR. Final spacing-only follow-up 9ff9d6ab is pending fresh lightweight UI/portable CI. No ASIO hardware claim, no installer/public release, no merge.

M11 — RECONCILE Player M2 main without loss of Vocal Throw, exact SHA 20e74bcd

Reconciled live main commit 9bd81a1b8da764a2f4523e70c0db60f583aa291f (Player M2 independent KEY/TEMPO + Signalsmith worker PCM + per-song controls) into complete Vocal Throw M10 via actual 2-parent Git merge. Commit parents are original Vocal Throw 9ff9d6ab82c87d13e827866cbc81a1522cd5682d and exact Player main 9bd81a1b8da764a2f4523e70c0db60f583aa291f. Conflict-aware integration accepted 11 precise upstream hunks in four shared files (CMakeLists.txt 1, src/LiveAudioEngine.h 2, src/Main.cpp 7, mixer-contextual-buttons.css 1), preserving both DSP paths. Inherited 14 exclusively upstream Player M2 source/test/license files byte-for-byte from main tree; no unrelated PR was cherry-picked.

Proof: compare GitHub main...20e74bcdd2fd46689d29976ec1100e50b2c94195: ahead=19, behind=0, status=ahead; only Vocal Throw-related files differ from main (35 paths), and GitHub reports PR mergeable. Quick native contracts 42709698957 PASS; real approved WebView Chromium 1366/650/390 42709698977 PASS. The merged exact SHA was dispatched via one /arsonmix-ci fat 20e74bcdd2fd46689d29976ec1100e50b2c94195 PR command (comment 6752860926) to run Windows MSVC/CTests, FAT portable GUI artifact and Inno installer verification: run 42709879873. Do not claim Windows/installer passed until run concludes, and no physical singer/ASIO field acceptance yet.

Sibling scope remains isolated: draft Harmony #487, Player M3 #500, dedicated ASIO4ALL verification #499, updater #501, desktop titlebar #498, SOURCE NONE #491 are not merged into this branch; preserving independent owners protects realtime audio integrity.

M12 — Windows exact-SHA software FAT completed (74/74 CTests PASS)

Release-candidate source SHA: 20e74bcdd2fd46689d29976ec1100e50b2c94195 (same current PR head and included in current main merge ancestry). Exact-SHA Windows FAT run: COMPLETED / SUCCESS. MSVC native executable and 74 CTests compiled and passed (100% tests passed, 0 failed out of 74), including NativeVocalThrowPhraseCaptureManualAutoAndNoHeap, NativeVocalThrowExpiredCueCancellation, NativeMusicTempoSourceOnsetsAndFallback, and ArSonPlayerM2IndependentKeyTempoStereoPCM. Approved /preview/ bundle provenance passed, verified JUCE portable ZIP built, per-user Windows RC Inno installer built/validated. Chromium integration UI run PASS at 1366,650,390 width. No additional source changes or redundant native builds after exact-SHA verification.

  • Verified portable FAT artifact: ArSonMix-GUI10CH-P012-Windows-x64.exe, PE AMD64/GUI; provenance binary SHA-256 eae2b52c6e46a6d0529e646ef5a7cab06bdc58a903096fc6dde9d2b74cd8034a.
  • Verified per-user Inno installer artifact: ArSonMix-Windows-x64-Setup-Preview.exe; provenance installer SHA-256 eafc5f168023e3875a931b83bfd7f089bd70e8e07bc6430236b820dfa5a9f4ed.
  • Independent download-side ZIP CRC and executable SHA-256 were re-checked against bundled BUILD_PROVENANCE.json and INSTALLER_PROVENANCE.json. Build manifest explicitly marks SOFTWARE_VERIFIED_PREVIEW_CANDIDATE / PREVIEW__INSTALLER_INTEGRITY_AND_UPDATE_TESTED, not public hardware-certified.

Release gate left open deliberately: physical ASIO input/output listening, live singer THROW latency/click tests, bypass/tail behavior, physical device/buffer transitions, XRUN/dropout checking, and interaction with independent Harmony/Player M3/Updater integration PRs. These cannot be substituted with a successful headless Windows CTest. Keep PR as DRAFT until owner field evidence and cross-PR acceptance; do not auto-merge or publish a stable release.

M13 cross-branch source reconciliation

This single-workstream Vocal Throw PR remains software FAT 74/74 PASS on exact 20e74bcd, with the approved purple THROW SVG and native DSP preserved. Its complete Git ancestry is now also included in integration QA PR #499 at two-parent merge c717be02 (confirmed no ancestry behind). Integration QA adds actual Player M3, source-none/ASIO4ALL, native WIRE/chrome, Inno M1, and the independently Windows-qualified Harmony warm bypass from PR #502. The exact original Vocal Throw core/processor/SVG blobs remain identical; the approved UI visual run remains green. Combined exact-SHA Windows CTest/installer run 42715980406 was requested once, pending outcome at this checkpoint. Do not merge #497 and #499 independently into main as duplicate feature deliveries; #499 remains isolated Draft / DO NOT MERGE, and latest sibling updater #501 and physical ASIO singer FAT are not implicitly qualified.

@cloudflare-workers-and-pages

cloudflare-workers-and-pages Bot commented Nov 9, 2026 •

Copy link
Copy Markdown

Deploying arsonmix with  Cloudflare Pages  Cloudflare Pages

Latest commit: 20e74bc
Status: ✅  Deploy successful!
Preview URL: https://f7cdb0f5.arsonmix.pages.dev
Branch Preview URL: https://integration-arson-vocal-thro-1fxj.arsonmix.pages.dev

View logs

masarray commented Nov 9, 2026

Copy link
Copy Markdown
Owner Author

/arsonmix-ci native 1aaae66

masarray commented Nov 9, 2026

Copy link
Copy Markdown
Owner Author

/arsonmix-ci native 9e7caf8

masarray commented Nov 9, 2026

Copy link
Copy Markdown
Owner Author

/arsonmix-ci native 4fa0edf

masarray commented Nov 9, 2026

Copy link
Copy Markdown
Owner Author

/arsonmix-ci fat a6943c7

masarray commented Nov 9, 2026

Copy link
Copy Markdown
Owner Author

/arsonmix-ci fat 20e74bc

@masarray masarray changed the title Vocal Throw M7 — reconcile complete native M1–M6 with latest ArSon Player main Vocal Throw M11 — full M1–M10 DSP/GUI reconciled with ArSon Player M2 main Nov 9, 2026

masarray commented Nov 9, 2026

Copy link
Copy Markdown
Owner Author

M11 exact-SHA ASIO performer acceptance (post FAT, not yet field-proven)

Test build SHA: 20e74bcdd2fd46689d29976ec1100e50b2c94195 (Windows CTest + preview package run). Record actual physical ASIO outcome separately from automatic CI:

  1. Cold launch, verify direct hardware input to singer channel remains audible dry via MAIN immediately; no ARM/MONITOR/NEEDS REMAPS operation. Validate independent Player M2 starts while native Vocal Throw is inserted; no speaker silence or ASIO glitches.
  2. In MANUAL, sing a short phrase, press the owner purple THROW button, confirm audible echo tail and no early/stale replay; rapidly trigger while PCM is running, observe release and count only after native ACK.
  3. Switch BYPASS OFF during active tail; bypass fades clicklessly; reject THROW while disabled; switch ON, first press must not replay old singing; only a new phrase may trigger.
  4. Select an explicit MUSIC channel for AUTO tempo; verify lock/confidence and fallback to manual/TAP on missing music, silence and channel/device changes. Ensure Player M2 tempo/key edits do not retune microphone/ASIO clock.
  5. Change buffer and audio device/sample rate; confirm previous FX settings, channel routing, and player controls survive or fail safely; no old-epoch completion re-enables stale settings.
  6. Repeat at expected live sample rates/buffers, including 44.1/48/96 kHz and 128/256 frames where supported. Verify no click, crackle, dropouts, stale graph error or monitor-off user action.

These are field acceptance criteria, not assertions of passing hardware tests. Keep this scope separate from Harmony #487, updater #501, Player M3 #500 and ASIO4ALL dedicated verification #499.

@masarray masarray closed this pull request by merging all changes into main in 6bcf88a Nov 10, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant