Skip to content

Integrate ArSon Vocal Throw M1–M4 with current main — preserve Harmony, Compressor and native PCM - #492

Closed
masarray wants to merge 125 commits into
mainfrom
integration/vocal-throw-m1-m4-main-20261109
Closed

masarray wants to merge 125 commits into
mainfrom
integration/vocal-throw-m1-m4-main-20261109

Conversation

@masarray

@masarray masarray commented Nov 9, 2026

Copy link
Copy Markdown
Owner

M5 P0 — native FX convergence, not a cosmetic merge

Two-parent commit 151601d829d18b893041bc08a483d0e73e17c7f8:

  • Parent 1: current protected main 381c140200d2f4ecb965183a2da1ba1e46d5d9c2 (Compressor restart fixes, merged Harmony, Player/docs).
  • Parent 2: preserved complete Vocal Throw M4 5f6b1b01ba41a5cc559f0335d38b052967949f55 (M1 native phrase DSP + M2 music BUS + M3 beat-grid + M4 Illustrator-based hardware VST GUI).
  • Both ancestries remain intact; no old branch was reset, rebased or force-pushed.

Audit and implementation

Three-way comparison at common ancestor 8accbc4: 31 Vocal Throw-specific changed files, 10 simultaneous edits. Resolved them semantically, retaining Harmony and Vocal Throw side by side in Main.cpp, LiveAudioEngine.h, NativeMixerSessionFxRestore.h, web/approved-native-bridge.js, scripts/compose_native_peq.py, and one shared EQ/Compressor/Harmony/Vocal Throw Power/Close CSS owner. Preserve current main Compressor source/PCM, latest CSS, UI build policy and merged Harmony editor. Other 20 files supplied directly from exact M4 tree. Details: docs/ARSON_VOCAL_THROW_M1_M4_MAIN_CONVERGENCE_20261109.md.

Built-in FX contract

EQ, Compressor, Harmony and Vocal Throw must coexist on arbitrary native ChannelId FX inserts, with source and output WIRE independent of FX picker availability. Native DSP graph acceptance and instance-bound ACK/readback stay authoritative, not GUI optimism. Music BUS tempo analysis remains off the realtime callback; no duplicate DSP renderer and no built-in prerequisite hardware input.

Qualification gates

  • New exact-SHA fast contracts (incl. Harmony + Vocal Throw combined picker/restore checks)
  • Real desktop and mobile Chromium GUI FAT on the integration branch
  • Once fast tests green, one scoped Windows MSVC/JUCE + realtime 64/64 CTest on new integration SHA — old green M1–M4 SHA isn't integration proof
  • Physical ASIO singer/music/bus/latency/xrun remain unproven and block product release

Safety: draft until CI + field review. Does not merge to main automatically. Preserve old draft PRs #469, #474, #476, #479 as original recovery checkpoints. Product issue #473 remains open. GitHub handoff #473 (comment)

… LCD beside TAP, universal rounded rotary arcs
…y main

Converge four native built-ins in one approved mixer graph, preserve
JUCE epoch/revision fences, restore/state/PCM acknowledgements, merge
native UI picker and shared CSS controls, add cross-FX contracts.

Main parent: 381c140
Vocal Throw parent: 5f6b1b0
Qualification pending on exact integration SHA.
@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: 141be94
Status: ✅  Deploy successful!
Preview URL: https://717c0900.arsonmix.pages.dev
Branch Preview URL: https://integration-vocal-throw-m1-m.arsonmix.pages.dev

View logs

masarray commented Nov 9, 2026

Copy link
Copy Markdown
Owner Author

/arsonmix-ci native 141be94

masarray commented Nov 9, 2026

Copy link
Copy Markdown
Owner Author

M5 P0 — source-history reconciliation checkpoint (2026-11-09)

Real two-parent integration: 151601d829d18b893041bc08a483d0e73e17c7f8

  • parent 1: protected main 381c140200d2f4ecb965183a2da1ba1e46d5d9c2 (Harmony and newest Compressor)
  • parent 2: exact saved M4 5f6b1b01ba41a5cc559f0335d38b052967949f55 (M1, M2, M3, M4)
  • PR exact current HEAD 141be941e652594e6b447997671ff2321a905868 adds a selective Vocal Throw Chromium gate for the integration branch.

Three-way semantic merge covered 10 files changed by BOTH ancestors. The rest is from either latest main or intact M4 tree. Specific integration checks now enforce the four built-in FX (EQ, Compressor, Harmony, Vocal Throw) all appear in the same approved picker/bridge, alongside native per-instance ACK and saved session restore; the latest main Harmony/Compressor code is present and untouched in non-overlap source files.

Verified current SHA: Fast UI #42602856018 SUCCESS, real Vocal Throw desktop+mobile Chromium SUCCESS, screenshots artifact #13666611552; fast native #42602855845 SUCCESS.

Latest full exact-SHA Windows JUCE/MSVC + realtime CTest: #42603163320 running during this checkpoint. Do not call this green until actual completion/log inspection. One dispatched run only; no duplicate Windows queue.

Blockers remain: New full Windows CTest, physical ASIO and real singer/music BUS beat sync and PDC/xrun evidence, and product release acceptance. No main merge, installer or field certification. Preserve PRs #469/#474/#476/#479 Draft as immutable recovery points; M5 PR remains Draft for qualification.

Copy link
Copy Markdown
Owner Author

Repository housekeeping (2026-11-10): Closing as superseded, not as a direct merge. The historical M1–M4 convergence was superseded by the newer M1–M11 reconciled integration, merged as #497, and combined M14 integration #499. Do not merge this old-based branch into current main. Hardware FAT remains #473/#412.

Code and review history remain on this PR; this closure does not assert a stable/public hardware-qualified release.

@masarray masarray closed this 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