Skip to content

M1 integrated operator: custom ASIO/WASAPI setup + selected CHANNEL flow + live AUX master on one engine - #231

Merged
masarray merged 1 commit into
mainfrom
feat/m1-integrated-device-channel-aux-20261031
Oct 31, 2026
Merged

masarray merged 1 commit into
mainfrom
feat/m1-integrated-device-channel-aux-20261031

Conversation

@masarray

Copy link
Copy Markdown
Owner

M1 integrated operator milestone, not competing parallel implementations

This is the conflict-resolved integration of completed DEVICE1 #228 with independently CI-proven M1B #226, based on latest main@56adb305cef484ae9799068a87a20a38661ea2a8. Original #226 cannot merge directly after DEVICE1; this one integration PR maintains both through a controlled 13-file merge and native+Chromium CI.

What operators can actually use

  • Existing AUDIO I/O custom ASIO/WASAPI input/output device, verified pins, sample rate/buffer and muted apply/ACK from DEVICE1, preserved unchanged in latest Main.cpp and mixer-io.js.
  • Slim premium 35px selected CHANNEL signal-flow header: native accepted SOURCE → FX → AUX SENDS → actual MAIN output, with click-through to the real engine controls, no giant cards or GUI repaint loop. No fake LIVE route state.
  • Actual audible AUX master gain per bus: existing prepared FX graph now owns four atomic targets and callback-only <=64-sample gain smoothing applied after AUX VST3 and before feeding MAIN+MONITOR. Separate from per-channel live POST AUX SEND; epoch/revision / enabled AUX / output safety admission; ACK updates accepted state, no graph rebuild, no duplicate callbacks, no plugin recreation, no global mute for gain.
  • Preserve SOURCE1 muted device-bound patch selection, MAIN/MONITOR/OUTPUT1, FX racks and editor leases, Show, RAIL3, +CHANNEL honest offline limitation and P0 — Crackling with 0 VST3: diagnose WASAPI clock/input/output buffering before engine expansion #15 reliability gate.

Integration specifics

  • Reapplied all source-level M1B changes as uniquely matched upstream hunks to current DEVICE1 base in Main.cpp, mixer-io.js/css, native Chromium/operator tests.
  • Core audio graph, renderer, route controller and PCM regression originate unchanged from M1B exact-head code.
  • Verified standalone GUI embedding is generated from the exact merged modular mixer-io.js and CSS. No old DEVICE1 UI regression by copying a stale full HTML.
  • FactoryFX and unrelated PRs stay untouched, no extra workflow or CI job.

Hard gates

Must pass exact-head Windows MSVC/CTest/ZIP and Chromium integrated operator smoke with source SHA 12582f29e3b8ebea442bab99eb2cffddf9e5dca2. After CI, real-device 0FX wired ASIO/WASAPI first, then audible MAIN/MONITOR→AUX master gain no-pop run. Do not claim ready for professional stage or complete eMotion LV1 parity without #15 hardware FAT, selected source click-flow hardware verification and plugin state tests. Original PR #226 is superseded by this integration PR; do not separately merge it. Operator FAT details.

@masarray
masarray marked this pull request as ready for review October 31, 2026 03:26
@masarray
masarray merged commit d3293af into main Oct 31, 2026
2 checks passed
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 31, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-31T03:28:43.584079Z 12582f2 Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 12582f29e3

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread web/monitor.js
Comment on lines +1257 to +1259
const ok=ack?.ok===true&&next.epoch===now.epoch&&
next.revision===now.revision&&next.acceptedRoute&&!patchPending&&
!mixerDraftActive;

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Preserve FX drafts when acknowledging AUX master gain

If an operator stages a routed FX edit after requesting an AUX master gain change but before its ACK arrives, __arMixStageRackFx sets rackFxDraft without setting mixerDraftActive. This ACK therefore passes the guard and calls hydrateAcceptedRoute(), overwriting the newly edited draftRoutes with the previously accepted FX chain while leaving rackFxDraft present. The subsequent FX APPLY silently submits the old chain instead of the operator's selection. Include rackFxDraft in the hydration guard, or update only the acknowledged AUX gain rather than rehydrating the entire shared draft. This preserves the shared FX draft/ACK interface specified in AGENTS.md.

AGENTS.md reference: AGENTS.md:L55-L55

Useful? React with 👍 / 👎.

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