diff --git a/.github/workflows/p1-windows.yml b/.github/workflows/p1-windows.yml
index 965bd2fbf..63ce63875 100644
--- a/.github/workflows/p1-windows.yml
+++ b/.github/workflows/p1-windows.yml
@@ -16,6 +16,9 @@ on:
# Native Windows gate executes this JS integration contract; source-only
# contract corrections must not leave a stale failed release gate.
- 'tests/live_routing_ui_contract_test.mjs'
+ - 'tests/console_v6_fat_gate_test.mjs'
+ - 'tests/native_embedded_gui_assets_contract_test.mjs'
+ - 'scripts/collect_hardware_fat_windows.ps1'
- 'scripts/package_native_windows.ps1'
- 'scripts/verify_native_windows_artifact.ps1'
- 'scripts/factoryfx_release_bundle.py'
@@ -35,6 +38,9 @@ on:
- 'tests/*native*contract*.mjs'
- 'tests/live_graph_contract_test.mjs'
- 'tests/ci_workflow_efficiency_test.mjs'
+ - 'tests/console_v6_fat_gate_test.mjs'
+ - 'tests/native_embedded_gui_assets_contract_test.mjs'
+ - 'scripts/collect_hardware_fat_windows.ps1'
- 'scripts/package_native_windows.ps1'
- 'scripts/verify_native_windows_artifact.ps1'
- 'scripts/factoryfx_release_bundle.py'
@@ -57,14 +63,32 @@ jobs:
timeout-minutes: 50
steps:
- uses: actions/checkout@v4
+ with:
+ # PR default is a transient refs/pull/*/merge. Test and package
+ # the precise approved ENGINE SHA, never a synthetic merge.
+ ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+ - name: Attest exact source SHA before native compile or packaging
+ shell: pwsh
+ run: |
+ $expected = "${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}"
+ $actual = (& git rev-parse HEAD).Trim()
+ if ($expected -notmatch '^[0-9a-f]{40}$' -or $actual -ne $expected) {
+ throw "ENGINE SOURCE SHA MISMATCH: expected=$expected checkout=$actual"
+ }
+ Write-Host "ENGINE_EXACT_SOURCE_SHA_VERIFIED: $actual"
- name: Cheap canonical Console v6 puzzle socket gate (no JUCE)
- run: node scripts/check_console_puzzle.mjs
+ run: |
+ node --test tests/engine_runtime_reconciliation_test.mjs
+ node scripts/check_console_puzzle.mjs
- name: Stop incomplete integrated product promotion before JUCE checkout
if: ${{ github.event_name == 'pull_request' && startsWith(github.head_ref, 'integration/product-') }}
run: node scripts/check_console_puzzle.mjs --release
- name: Fast offline FactoryFX release and integrity contract tests
shell: pwsh
run: |
+ $tokens=$null; $parseErrors=$null
+ [System.Management.Automation.Language.Parser]::ParseFile('scripts/collect_hardware_fat_windows.ps1',[ref]$tokens,[ref]$parseErrors) | Out-Null
+ if (@($parseErrors).Count -gt 0) { throw ($parseErrors | Out-String) }
python -m unittest discover -s scripts/tests -p test_factoryfx_release_bundle.py -v
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
- name: Checkout JUCE 8 pinned
@@ -81,7 +105,7 @@ jobs:
run: |
# Do not hide earlier Node failures with the exit code of the LAST
# command. One Node invocation also avoids repeated startup costs.
- foreach ($file in @('web/bridge.js', 'web/plugin-ui.js', 'web/monitor.js', 'web/app.js', 'web/mixer-io.js', 'web/mixer-layout.js')) {
+ foreach ($file in @('web/bridge.js', 'web/plugin-ui.js', 'web/monitor.js', 'web/app.js', 'web/mixer-io.js', 'web/mixer-layout.js', 'web/hardware-keys.js')) {
node --check $file
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
}
@@ -100,6 +124,8 @@ jobs:
'tests/independent_clock_adapter_contract_test.mjs'
'tests/direct_restore_recovery_contract_test.mjs'
'tests/native_artifact_packaging_contract_test.mjs'
+ 'tests/console_v6_fat_gate_test.mjs'
+ 'tests/native_embedded_gui_assets_contract_test.mjs'
'tests/portable_workspace_contract_test.mjs'
'tests/plugin_vault_contract_test.mjs'
'tests/plugin_ui_contract_test.mjs'
@@ -137,12 +163,12 @@ jobs:
& ./scripts/verify_native_windows_artifact.ps1 -OutputDir dist
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
# PRs compile/CTest/package but never silently publish a stable build.
- # This single M4 FAT branch is explicitly allowed to upload an
- # UNQUALIFIED experimental ZIP for real physical hardware testing.
+ # Exactly one joined ENGINE+GUI+FAT PR can upload an UNQUALIFIED
+ # experimental executable. This does not enable universal claims.
- uses: actions/upload-artifact@v4
- if: ${{ github.event_name != 'pull_request' || github.head_ref == 'milestone/m4-unified-native-multichannel-fx-20261101' }}
+ if: ${{ github.event_name != 'pull_request' || github.head_ref == 'milestone/m5-universal-channelid-vst3-lease-migration-20261101' || github.head_ref == 'work/integration-fat-console-v6' }}
with:
- name: ${{ github.event_name == 'pull_request' && 'ArSonMix-M4-EXPERIMENTAL-Hardware-FAT-Windows-x64' || 'ArSonMix-GUI10CH-P012-Verified-Hardware-FAT-Windows-x64' }}
+ name: ${{ github.event_name == 'pull_request' && (github.head_ref == 'work/integration-fat-console-v6' && 'ArSonMix-JOINED-10CH4AUX-EXPERIMENTAL-Hardware-FAT-Windows-x64' || 'ArSonMix-ENGINE-10CH4AUX-EXPERIMENTAL-Hardware-FAT-Windows-x64') || 'ArSonMix-GUI10CH-P012-Verified-Hardware-FAT-Windows-x64' }}
path: dist/
if-no-files-found: error
retention-days: 14
diff --git a/.github/workflows/ui-smoke.yml b/.github/workflows/ui-smoke.yml
index 4ed052310..e5c90d0f9 100644
--- a/.github/workflows/ui-smoke.yml
+++ b/.github/workflows/ui-smoke.yml
@@ -26,7 +26,7 @@ on:
- 'tests/*gui*contract*.mjs'
- 'tests/native_ui_contract_test.mjs'
- 'tests/native_orbit_ui_smoke.py'
- - 'tests/ci_workflow_efficiency_test.mjs'
+ - 'tests/ci_workflow_efficiency_test.mjs tests/console_v6_fat_gate_test.mjs tests/native_embedded_gui_assets_contract_test.mjs'
- '.github/workflows/ui-smoke.yml'
- '.github/workflows/pages-publish.yml'
workflow_dispatch:
diff --git a/AR-MIX-Live-FX-Host-Standalone-v0.3.html b/AR-MIX-Live-FX-Host-Standalone-v0.3.html
index d280a1443..2a8f9b2f9 100644
--- a/AR-MIX-Live-FX-Host-Standalone-v0.3.html
+++ b/AR-MIX-Live-FX-Host-Standalone-v0.3.html
@@ -612,7 +612,7 @@
Semantic colors alone define the latched state; only the transient :active
pointer press moves the cap inward by 1px without changing its layout slot. */
:root{
- --b180-off:#cbd1d1;--b180-edge:#747f7f;--b180-off-ink:#172229;
+ --b180-off:#E7EFF0;--b180-edge:#747f7f;--b180-off-ink:#172229;
--b180-color:var(--b180-off);--b180-border:var(--b180-edge);
--b180-ink:var(--b180-off-ink);
--b180-on-cyan:#94e8ed;--b180-on-green:#91edac;
@@ -1448,6 +1448,163 @@
background-clip:content-box;border:0;box-shadow:none;
}
#app #mixer .meter .clip-led.latched{box-shadow:none!important}
+/* Owner-approved V5 graphite hardware keys, production native/legacy console.
+ ONE SVG cutout legend, ONE white edge shine, asymmetric occluded leakage.
+ No hover repaint, SVG filters, blur, infinite animation, or fake audio state.
+ This module is LAST in the deterministic CSS build, replacing BTN-180 only
+ on opt-in tactile mixer buttons. Navigation, routing pins, meters, faders,
+ editor launchers, dropdowns and ordinary dialog actions are NOT backlit. */
+#app button.mx-hw-key {
+ --mx-hw-led:210,225,234;
+ position:relative!important;
+ display:inline-block!important;
+ box-sizing:border-box!important;
+ min-width:0!important;
+ padding:2px!important;
+ overflow:hidden!important;
+ isolation:isolate!important;
+ border:1px solid #0c151b!important;
+ border-radius:5px!important;
+ background:linear-gradient(180deg,#0b141b,#25343d)!important;
+ box-shadow:inset 0 2px 4px #03080db5!important;
+ color:transparent!important;
+ text-shadow:none!important;
+ letter-spacing:0!important;
+ line-height:normal!important;
+ filter:none!important;
+ backdrop-filter:none!important;
+ -webkit-backdrop-filter:none!important;
+ transform:none!important;
+ transition:none!important;
+ text-align:center!important;
+ cursor:pointer;
+ touch-action:manipulation;
+}
+#app button.mx-hw-key.mx-hw-mute {--mx-hw-led:255,64,85}
+#app button.mx-hw-key.mx-hw-solo {--mx-hw-led:255,208,44}
+#app button.mx-hw-key.mx-hw-cue {--mx-hw-led:90,200,231}
+#app button.mx-hw-key.mx-hw-processing {--mx-hw-led:87,211,189}
+#app button.mx-hw-key.mx-hw-phase {--mx-hw-led:243,164,81}
+#app button.mx-hw-key.mx-hw-link {--mx-hw-led:163,141,235}
+#app button.mx-hw-key.mx-hw-neutral {--mx-hw-led:210,225,234}
+/* V5 leakage strategy: four tiny STATIC gradients only in the closest
+ 1–2px gap, unequal sides, lower-center stronger; top almost occluded. */
+#app button.mx-hw-key::before {
+ content:""!important;
+ display:block!important;
+ position:absolute!important;
+ inset:1px!important;
+ border:0!important;
+ border-radius:4px!important;
+ width:auto!important;height:auto!important;
+ transform:none!important;
+ pointer-events:none!important;
+ z-index:2!important;
+ opacity:0!important;
+ box-shadow:none!important;
+ background:
+ linear-gradient(90deg,transparent 0%,rgba(var(--mx-hw-led),.035) 18%,
+ rgba(var(--mx-hw-led),.16) 33%,rgba(var(--mx-hw-led),.46) 49%,
+ rgba(var(--mx-hw-led),.27) 63%,rgba(var(--mx-hw-led),.07) 80%,transparent 100%)
+ center bottom / calc(100% - 12px) 2px no-repeat,
+ linear-gradient(180deg,transparent 0%,transparent 30%,
+ rgba(var(--mx-hw-led),.045) 50%,rgba(var(--mx-hw-led),.21) 75%,
+ rgba(var(--mx-hw-led),.1) 88%,transparent 100%)
+ left bottom / 2px 100% no-repeat,
+ linear-gradient(180deg,transparent 0%,transparent 44%,
+ rgba(var(--mx-hw-led),.075) 65%,rgba(var(--mx-hw-led),.17) 85%,
+ transparent 100%)
+ right bottom / 2px 100% no-repeat,
+ linear-gradient(90deg,transparent 0%,transparent 34%,
+ rgba(var(--mx-hw-led),.055) 50%,transparent 67%,transparent 100%)
+ center top / calc(100% - 18px) 1px no-repeat!important;
+}
+#app button.mx-hw-key::after{content:none!important;display:none!important}
+#app button.mx-hw-key[aria-pressed="true"]::before,
+#app button.mx-hw-key.active::before,
+#app button.mx-hw-key.selected::before,
+#app button.mx-hw-key.power-on::before,
+#app button.mx-hw-key[data-mx-hw-on="true"]::before {opacity:1!important}
+#app button.mx-hw-key > svg.mx-hw-face {
+ position:absolute!important;
+ z-index:1!important;
+ top:2px!important;right:2px!important;bottom:2px!important;left:2px!important;
+ width:calc(100% - 4px)!important;
+ height:calc(100% - 4px)!important;
+ display:block!important;
+ min-height:0!important;
+ overflow:hidden!important;
+ pointer-events:none!important;
+ transform:translateY(0)!important;
+ transition:none!important;
+ filter:none!important;
+}
+#app button.mx-hw-key svg .mx-hw-lamp {opacity:0!important}
+#app button.mx-hw-key[aria-pressed="true"] svg .mx-hw-lamp,
+#app button.mx-hw-key.active svg .mx-hw-lamp,
+#app button.mx-hw-key.selected svg .mx-hw-lamp,
+#app button.mx-hw-key.power-on svg .mx-hw-lamp,
+#app button.mx-hw-key[data-mx-hw-on="true"] svg .mx-hw-lamp {opacity:1!important}
+#app button.mx-hw-key[aria-pressed="true"] > svg.mx-hw-face,
+#app button.mx-hw-key.active > svg.mx-hw-face,
+#app button.mx-hw-key[data-mx-hw-on="true"] > svg.mx-hw-face {
+ transform:translateY(1px)!important;
+}
+#app button.mx-hw-key > .mx-hw-screen-reader{
+ position:absolute!important;
+ width:1px!important;height:1px!important;
+ margin:-1px!important;padding:0!important;
+ border:0!important;overflow:hidden!important;
+ clip-path:inset(50%)!important;
+ white-space:nowrap!important;
+}
+#app button.mx-hw-key:hover:not(:disabled){
+ filter:none!important;
+ background:linear-gradient(180deg,#0b141b,#25343d)!important;
+ box-shadow:inset 0 2px 4px #03080db5!important;
+}
+#app button.mx-hw-key:active:not(:disabled){
+ transform:none!important;
+ background:linear-gradient(180deg,#0b141b,#25343d)!important;
+ box-shadow:inset 0 2px 4px #03080db5!important;
+}
+#app button.mx-hw-key:active:not(:disabled) > svg.mx-hw-face{
+ transform:translateY(1px)!important;
+}
+#app button.mx-hw-key:focus-visible{
+ outline:2px solid #9bbecd!important;
+ outline-offset:2px!important;
+}
+#app button.mx-hw-key:disabled {
+ cursor:not-allowed!important;
+ opacity:.47!important;
+ filter:none!important;
+}
+#app button.mx-hw-key:disabled::before{opacity:0!important}
+#app button.mx-hw-key:disabled svg .mx-hw-lamp{opacity:0!important}
+/* Keep target strip geometry intact, bypassing the legacy BTN-180 face. */
+#app #mixer .channel-actions button.mx-hw-key,
+#app #mixer .utility-row button.mx-hw-key {
+ flex:1 1 0;
+}
+/* The legacy MASTER MUTE was sized only by .candy. Own its 29px geometry
+ explicitly after replacing that obsolete class, matching every strip. */
+#app #masterLeft .master-actions button.mx-hw-key,
+#app #masterMute.mx-hw-key{
+ height:29px!important;
+ min-height:29px!important;
+ max-height:29px!important;
+ align-self:center!important;
+}
+#app #mixer [data-channel-format-toggle].mx-hw-key{
+ min-width:20px!important;
+}
+#app .arV6Controls button.mx-hw-key{width:28px!important;height:28px!important;padding:2px!important}
+#app .arV6FxSlot button.mx-hw-key{min-width:27px!important;min-height:22px!important;padding:2px!important}
+#app .arV6Send button.mx-hw-key{min-width:34px!important;min-height:20px!important;padding:2px!important}
+@media(prefers-reduced-motion:reduce){
+ #app button.mx-hw-key,#app button.mx-hw-key > svg.mx-hw-face{transition:none!important}
+}
@@ -2401,7 +3892,7 @@
['Backing','♫',['EQ','Reverb'],-3.6,-25],
['Guitar','♬',['EQ','Compressor','Delay'],-7.9,30],
['Keyboard','▥',['EQ','Reverb'],-14.2,0],
- ['FX Return','◎',['Reverb'],-5.1,0]
+ ['Input 10','♩',['Reverb'],-5.1,0]
];
const channels=raw.map((a,i)=>({id:i+1,name:a[0],icon:a[1],color:colors[i],inserts:[...a[2]],fader:a[3],pan:a[4],trim:0,mute:false,solo:false,pre:false,hpf:i%4!==0,stereo:i>=6}));
let currentChannel=0, masterSelected=false, view='MIX', sceneIdx=0, timer=0;
@@ -2656,19 +4147,38 @@
document.querySelectorAll('.strip.identity-editing').forEach(el=>el.classList.remove('identity-editing'));
}
function commitChannelIdentity(){
- if(editingChannel<0)return;const index=editingChannel;
- const name=$('identityName').value.trim().replace(/\s+/g,' ').slice(0,26);
+ if(editingChannel<0)return;
+ const index=editingChannel, name=$('identityName').value.trim().replace(/\s+/g,' ').slice(0,26);
if(!name){flash('Enter a channel name');$('identityName').focus();return}
- channels[index].name=name;channels[index].icon=channelIcons.includes(editingIcon)?editingIcon:'♩';
- channels[index].color=channelPalette.includes(editingColor)?editingColor:colors[index];
- closeChannelIdentity();currentChannel=index;renderMixer();
+ if(channels.some((c,i)=>i!==index&&c.name.trim().toLowerCase()===name.toLowerCase())){
+ flash('Channel name already used');$('identityName').focus();return;
+ }
+ const ch=channels[index];
+ ch.name=name;ch.icon=channelIcons.includes(editingIcon)?editingIcon:'♩';
+ ch.color=channelPalette.includes(editingColor)?editingColor:colors[index];
+ closeChannelIdentity();currentChannel=index;
+ // UI identity is not a native graph change. Do not remount any live FX/fader node.
+ const strip=document.querySelector('#mixer [data-strip="'+index+'"]');
+ if(strip){
+ strip.style.setProperty('--ch',ch.color);
+ for(const [sel,val] of [['.arChannelTopName',ch.name],['.arChannelTopIcon',ch.icon],
+ ['.strip-name .strip-caption',ch.name],['.strip-name .track-icon',ch.icon]]){
+ const item=strip.querySelector(sel);if(item)item.textContent=val;
+ }
+ strip.querySelector('[data-identity-open]')?.setAttribute('aria-label','Edit '+ch.name+' name, icon and color');
+ strip.querySelector('[data-editstrip]')?.setAttribute('aria-label','Double-click to edit '+ch.name+' name, icon and color');
+ strip.querySelector('[data-fader]')?.setAttribute('aria-label',ch.name+' fader');
+ const meter=strip.querySelector('.vu-bank');
+ if(meter)meter.setAttribute('aria-label',ch.name+(ch.stereo?' stereo left and right meters':' mono meter'));
+ }
+ createSide();
if(view==='FX RACK')renderRackWorkspace();
- persistSession();flash('Channel identity updated');
+ persistSession();flash('Channel label updated · native audio route unchanged');
}
window.addEventListener('resize',positionChannelIdentity);
$('mixer').addEventListener('scroll',positionChannelIdentity,{passive:true});
function makeStrip(ch,i){let inserts=ch.inserts.slice(0,6);while(inserts.length<6) inserts.push('');return `
- ${i+1}${ch.stereo?'ST':'M'}
${inserts.map((n,j)=>`
${n?'':'+ '}${n? safeText(n):'ADD FX'} ${n?`⏻ `:''}
`).join('')}
+ CH ${String(i+1).padStart(2,'0')} ${safeText(ch.icon)} ${safeText(ch.name)} ${ch.stereo?'ST':'M'}
${inserts.map((n,j)=>`
${n?'':'+ '}${n? safeText(n):'ADD FX'} ${n?`⏻ `:''}
`).join('')}
${knobMarkup('trim',i,ch.trim,'Trim')}
${panMarkup(ch,i)}
L ${panText(ch.pan)} R
Ø HPF
MUTE SOLO
${fmt(ch.fader)}
${ch.stereo?meterUnit(String(i)+'L','L')+meterUnit(String(i)+'R','R'):meterUnit(String(i),'')}${meterScaleMarkup()}
${faderScaleMarkup()}
@@ -2695,7 +4205,7 @@
window.__arMixSyncAcceptedChannelFormat=syncStripFormat;
function renderMixer(){
const x=$('mixer'),scroll=x.scrollLeft;
- x.innerHTML=channels.map(makeStrip).join('')+' ';
+ x.innerHTML=channels.map(makeStrip).join('')+' ';
renderMaster();x.scrollLeft=scroll;createSide();
}
let masterGain=-.1,masterPan=0,masterMute=false,masterMono=false,phones=-12,masterInserts=['Studio EQ','Brickwall Limiter'],masterBypassed={},pendingMasterSlot=null;
@@ -2717,7 +4227,7 @@
function meterUnit(key,label){return ``}
function renderMaster(){
const host=$('masterLeft');if(!host)return;
- host.innerHTML=`MASTER
+ host.innerHTML=`
${masterFxRows()}
@@ -2839,6 +4349,11 @@
if(b.dataset.pluginManager!==undefined){flash('Plugin Manager is available in the Windows desktop app');return}
if(b.dataset.mySounds!==undefined){flash('Native VST3 presets are available in the Windows desktop app');return}
if(b.dataset.choose!==undefined){chooseChannel(+b.dataset.choose);return}
+ if(b.dataset.identityOpen!==undefined){
+ const index=Number(b.dataset.identityOpen);
+ if(Number.isInteger(index)&&index>=0&&index
=channels.length)return;
@@ -2854,11 +4369,11 @@
if(b.dataset.mute!==undefined){toggleState(+b.dataset.mute,'mute');return}if(b.dataset.solo!==undefined){toggleState(+b.dataset.solo,'solo');return}
if(b.dataset.pre!==undefined){let i=+b.dataset.pre;channels[i].pre=!channels[i].pre;b.classList.toggle('active');send('phase',channels[i].pre,i);return}
if(b.dataset.hpf!==undefined){let i=+b.dataset.hpf;channels[i].hpf=!channels[i].hpf;b.classList.toggle('active');send('hpf',channels[i].hpf,i);return}
- if(b.dataset.masterInsert!==undefined){pendingMasterSlot=+b.dataset.masterInsert;openPluginBrowser(currentChannel,true);return}
+ if(b.dataset.masterInsert!==undefined){pendingMasterSlot=+b.dataset.masterInsert;if(!window.__JUCE__?.backend?.emitEvent)openQuickFx(currentChannel,pendingMasterSlot,b,true);return}
if(b.dataset.masterPower!==undefined){const slot=+b.dataset.masterPower;masterBypassed[slot]=!masterBypassed[slot];renderMaster();persistSession();send('masterFxBypass',{slot,bypass:masterBypassed[slot]},-1);return}
if(b.dataset.clip!==undefined){resetClip(b.dataset.clip);return}
if(b.dataset.fxpower!==undefined){const [i,j]=b.dataset.fxpower.split(':').map(Number);setFxBypass(i,j,!bypassed[fxKey(i,j)]);return}
- if(b.dataset.insert){let [i,j]=b.dataset.insert.split(':').map(Number);currentChannel=i;pendingSlot=j;openPluginBrowser(i);return}
+ if(b.dataset.insert){let [i,j]=b.dataset.insert.split(':').map(Number);if(!window.__JUCE__?.backend?.emitEvent)openQuickFx(i,j,b);return}
if(b.dataset.deleteScene!==undefined){deleteMixerSnapshot(b.dataset.deleteScene);return}
if(b.dataset.scene!==undefined){loadSnapshotByIndex(+b.dataset.scene);return}
if(b.dataset.preset){applyQuickPreset(b.dataset.preset);return}
@@ -3148,8 +4663,74 @@
return;
}
$('rackWorkspace').innerHTML=`NO TECHNICAL PATCHBAY REQUIRED Signal Flow — See where your voice goes A beginner-first view of the real-time audio path. Select your audio device in Setup.
CHOOSE AUDIO DEVICE 01 · INPUT Microphone Audio Interface ASIO or WASAPI
➜ 02 · FX CHAIN VST3 Plugins EQ · Dynamics Reverb · Delay
➜ 03 · MIXER Mix & Monitor Fader · Pan Master · Meters
➜ 04 · OUTPUT Speakers / Stream Audio Device Streaming bridge later
⚠ In this trial the audio flow is a visual concept; no microphone is captured and no audio is sent to a livestream. OPEN FX RACK
`}
+
+// Adopt PR #278 V5 contextual quick-insert on the ORIGINAL mixer.
+// Desktop native operations remain owned by bridge.js; this uses preview
+// catalog ONLY when JUCE is absent, never as a fabricated VST3 instance.
+const arV5Quick=document.createElement('section');
+arV5Quick.className='arV5QuickFx';arV5Quick.hidden=true;
+arV5Quick.setAttribute('role','dialog');
+arV5Quick.setAttribute('aria-label','Quick add effect');
+arV5Quick.innerHTML='ADD FX ×
'+
+ ' '+
+ '
'+
+ '';
+document.querySelector('#app .workbench')?.append(arV5Quick);
+const arV5Search=arV5Quick.querySelector('.arV5QuickSearch'),
+ arV5Results=arV5Quick.querySelector('.arV5QuickResults');
+let arV5Anchor=null;
+function closeQuickFx(focus=false){
+ if(arV5Quick.hidden)return;
+ arV5Quick.hidden=true;
+ if(focus&&arV5Anchor?.isConnected)arV5Anchor.focus();
+ arV5Anchor=null;
+}
+function renderQuickFx(){
+ if(arV5Quick.hidden)return;
+ arV5Results.replaceChildren();
+ const q=arV5Search.value.trim().toLocaleLowerCase();
+ const found=pluginCatalog.filter(p=>
+ (p.name+' '+p.type+' '+(p.hint||'')).toLocaleLowerCase().includes(q));
+ for(const fx of found.slice(0,64)){
+ const b=document.createElement('button');b.type='button';
+ b.className='arV5QuickResult';b.dataset.fastPlugin=fx.name;
+ const title=document.createElement('span');title.textContent=fx.name;
+ const kind=document.createElement('small');kind.textContent=fx.type;
+ b.append(title,kind);arV5Results.append(b);
+ }
+ if(!found.length){const p=document.createElement('p');p.textContent='No matching demo effects';arV5Results.append(p);}
+}
+function openQuickFx(channel,slot,anchor,isMaster=false){
+ if(window.__JUCE__?.backend?.emitEvent)return false;
+ if(!isMaster){currentChannel=channel;pendingMasterSlot=null;pendingSlot=slot;}
+ else pendingMasterSlot=slot;
+ arV5Anchor=anchor;
+ arV5Quick.querySelector('.arV5QuickHead strong').textContent=
+ (isMaster?'MAIN':channels[channel]?.name||'CHANNEL')+' · FX '+(slot+1)+' · UI PREVIEW';
+ const host=arV5Quick.parentElement,r=anchor?.getBoundingClientRect(),p=host?.getBoundingClientRect();
+ if(r&&p){arV5Quick.style.left=Math.max(6,Math.min(r.left-p.left,p.width-320))+'px';
+ arV5Quick.style.top=Math.max(6,Math.min(r.bottom-p.top+4,p.height-360))+'px';}
+ arV5Quick.hidden=false;arV5Search.value='';renderQuickFx();arV5Search.focus();return true;
+}
+arV5Search.addEventListener('input',renderQuickFx);
+arV5Quick.addEventListener('click',e=>{
+ if(e.target.closest('[data-fast-close]')){closeQuickFx(true);return;}
+ if(e.target.closest('[data-fast-manager]')){
+ closeQuickFx();openPluginBrowser(currentChannel,pendingMasterSlot!==null);return;}
+ const b=e.target.closest('[data-fast-plugin]');if(!b)return;
+ if(!pluginCatalog.some(p=>p.name===b.dataset.fastPlugin))return;
+ closeQuickFx();insertPlugin(b.dataset.fastPlugin);
+});
+arV5Quick.addEventListener('keydown',e=>{
+ if(e.key==='Escape'){e.preventDefault();e.stopPropagation();closeQuickFx(true);}
+ if(e.key==='Enter'&&e.target===arV5Search){
+ const first=arV5Results.querySelector('[data-fast-plugin]');
+ if(first){e.preventDefault();first.click();}
+ }
+});
+
function openPluginBrowser(idx,isMaster=false){if(!isMaster){currentChannel=idx;pendingMasterSlot=null}activeCategory='All';$('pluginModal').classList.remove('hidden');$('pluginTarget').textContent=isMaster?'Adding to MASTER bus · demo FX catalog':'Adding to '+channels[idx].name+' · virtual effects catalog';$('pluginSearch').value='';renderPluginBrowser();$('pluginSearch').focus()}
-function closePluginBrowser(){$('pluginModal').classList.add('hidden')}
+function closePluginBrowser(){closeQuickFx();$('pluginModal').classList.add('hidden')}
function renderPluginBrowser(){document.querySelectorAll('[data-category]').forEach(b=>b.classList.toggle('active',b.dataset.category===activeCategory));const q=$('pluginSearch').value.trim().toLowerCase();let pool=pluginCatalog.filter(p=>(activeCategory==='All'||p.type===activeCategory)&&`${p.name} ${p.type} ${p.hint}`.toLowerCase().includes(q));$('pluginResults').innerHTML=pool.map(p=>`${safeText(p.badge)} ${safeText(p.name)} ${safeText(p.type)} · ${safeText(p.hint)} `).join('')||'No matching demo effects.
'}
function insertPlugin(name){
if(pendingMasterSlot!==null){
@@ -3369,7 +4950,7 @@
$('pluginModal').addEventListener('click',e=>{if(e.target===$('pluginModal'))closePluginBrowser()});
$('channelIdentity').addEventListener('click',e=>{if(e.target===$('channelIdentity'))closeChannelIdentity()});
$('identityName').addEventListener('keydown',e=>{if(e.key==='Enter'){e.preventDefault();commitChannelIdentity()}});
-document.addEventListener('keydown',e=>{if(e.key==='Escape'){closePluginBrowser();closeChannelIdentity()}if((e.key==='Enter'||e.key===' ')&&e.target.matches('[data-editstrip]')){e.preventDefault();openChannelIdentity(+e.target.dataset.editstrip)}});
+document.addEventListener('keydown',e=>{if(e.key==='F8'&&!e.repeat&&!document.documentElement.classList.contains('ar-v6-active')){e.preventDefault();if(window.__JUCE__?.backend?.emitEvent)document.querySelector('[data-plugin-manager]')?.click();else{closeQuickFx();openPluginBrowser(currentChannel,pendingMasterSlot!==null)}return;}if(e.key==='Escape'){closeQuickFx();closePluginBrowser();closeChannelIdentity()}if((e.key==='Enter'||e.key===' ')&&e.target.matches('[data-editstrip]')){e.preventDefault();openChannelIdentity(+e.target.dataset.editstrip)}});
document.addEventListener('change',e=>{if(e.target.id==='rackChannel')chooseChannel(+e.target.value)});
document.addEventListener('click',e=>{const id=e.target.closest('button')?.id;if(id==='saveFxFromRack')saveFxChainPreset();else if(id==='recallFxPreset')recallFxChain();else if(id==='openSetupFromFlow')$('audioSetupBtn')?.click();else if(id==='flowFxButton')setView('FX RACK');else if(id==='backMixer')setView('MIX')});
// The UI-only envelope remains one atomic storage transaction, never a 5s
@@ -3465,11 +5046,11 @@
const mixer=document.getElementById('mixer');
const host=document.querySelector('.workbench');
if(!mixer||!host)return;
- let mode='FX', lastStatus={}, deviceInventory=null, ioTab='device', lastSignature='', focusedInput=2;
+ let mode='CONSOLE', lastStatus={}, deviceInventory=null, ioTab='device', lastSignature='', focusedInput=0;
let monitorSendsExpanded=false;
// DEVICE1: staged selections are UI-only; only positive native ACK changes active hardware.
let deviceDraft=null,deviceBusy=false,deviceNote='',deviceRequest='',deviceRequestSeq=0,lastDeviceRefresh=0,lastDeviceRescan=0,applyMutePending=false,applyAfterDevice=null,applyBaseEpoch=0;
- let deviceMatrixView='inputs',deviceMatrixWaitEpoch=null; // Never display old hardware pins after an APPLY ACK.
+ let deviceMatrixView='inputs',deviceMatrixWaitEpoch=null,deviceMatrixOpen=false; // Never display old hardware pins after an APPLY ACK.
// Pending SOURCE ACK is a UI projection only; monitor.js owns the native route.
let quickSourcePending=null;
const el=id=>document.getElementById(id);
@@ -3707,13 +5288,19 @@
return section;
}
+ // Only an ACKed physical MAIN pair is a MAIN route. Available output pins
+ // are merely inventory, never proof that a route has been selected.
const outputLabel=s=>{
- const out=s.mainOutputs?.length===2?s.mainOutputs:s.outputPorts||[];
- return s.ready&&Number.isInteger(out[0])&&Number.isInteger(out[1])?
- 'MAIN → HW '+(out[0]+1)+'/'+(out[1]+1):'MAIN → NO HW OUTPUT';
+ const out=s.mainOutputs,enabled=new Set(s.outputPorts||[]);
+ if(!s.ready)return 'MAIN → NO DEVICE';
+ if(!Array.isArray(out)||out.length!==2)return 'MAIN → UNPATCHED';
+ if(!Number.isInteger(out[0])||!Number.isInteger(out[1])||
+ out[0]===out[1]||!enabled.has(out[0])||!enabled.has(out[1]))
+ return 'MAIN → INVALID L/R';
+ return 'MAIN → HW '+(out[0]+1)+'/'+(out[1]+1);
};
const toolbar=node('div','arMixerBankBar');
- toolbar.innerHTML='FX ROUTE SENDS
NO HARDWARE · PREVIEW
APPLY AUDIO I/O ';
+ toolbar.innerHTML='CONSOLE FX ROUTE SENDS
NO HARDWARE · PREVIEW
APPLY AUDIO I/O ';
host.insertBefore(toolbar,mixer);
// One genuinely selected-channel journey, NOT another DSP or source registry.
// Four compact steps show ACKNOWLEDGED state, never stage a hidden graph.
@@ -3912,7 +5499,7 @@
sofControls.hidden=true;toolbar.appendChild(sofControls);
const overlay=node('div','arIOOverlay');
overlay.id='arIOOverlay';overlay.hidden=true;
- overlay.innerHTML='
DEVICE / DRIVER INPUT ROUTING OUTPUT ROUTING
Hardware changes require native ACK. Output stays MUTED on APPLY. REVERT DRAFT APPLY PATCH ADVANCED BUS / FX REVERT DEVICE APPLY DEVICE ';
+ overlay.innerHTML='
1 · DEVICE 2 · INPUT → CHANNEL 3 · MAIN OUT
Hardware changes require native ACK. Output stays MUTED on APPLY. REVERT DRAFT APPLY PATCH ADVANCED BUS / FX REVERT DEVICE APPLY DEVICE ';
document.body.appendChild(overlay);
const audioPath=node('div','arIOAudioPath');audioPath.id='arIOAudioPath';
audioPath.innerHTML='CAPTURE · WAIT ROUTE · WAIT MIXER · WAIT OUTPUT · WAIT OPEN SIGNAL CHECK ';
@@ -4228,7 +5815,7 @@
window.__arMixOpenAudioIO=openIO;
function closeIO(){overlay.hidden=true;matrixDraft.clear();matrixSide.clear();matrixMessage='';}
function setMode(next){
- if(!['FX','ROUTE','SENDS'].includes(next))return;
+ if(!['CONSOLE','FX','ROUTE','SENDS'].includes(next))return;
if(next!=='SENDS'&&sofBus>=0)leaveSof();
mode=next;mixer.dataset.ioMode=mode;
toolbar.querySelectorAll('[data-mix-mode]').forEach(b=>{const selected=b.dataset.mixMode===mode;b.classList.toggle('active',selected);b.setAttribute('aria-pressed',String(selected));});
@@ -4247,7 +5834,7 @@
}
if(strip.querySelector('.arChannelBank'))continue;
const bank=node('div','arChannelBank');
- bank.innerHTML='INPUT SOURCE · NATIVE OUTPUT DESTINATION MAIN · UNKNOWN CH M CH L/R NATIVE PATCH REQUIRED
OPEN INPUT PATCH AUX SENDS · PRE / POST
EDIT AUX SENDS ';
+ bank.innerHTML='INPUT SOURCE · NATIVE OUTPUT DESTINATION MAIN · UNKNOWN CH M CH L/R NATIVE PATCH REQUIRED
OPEN INPUT PATCH AUX SENDS · PRE / POST
EDIT AUX SENDS ';
strip.querySelector('.rack')?.insertAdjacentElement('afterend',bank);
}
}
@@ -4287,8 +5874,22 @@
const dirty=current!==valueFor(accepted)||channelFormat(r)!==channelFormat(accepted);
const stage=strip.querySelector('.arBankStage');
const sourcePending=quickSourcePending?.channel===i&&quickSourcePending.epoch===s.epoch;
- stage.textContent=!s.ready?'NO LIVE DEVICE':sourcePending?'PENDING · NATIVE ACK':dirty?'DRAFT · NOT APPLIED':r.mode==='NONE'?'UNPATCHED · SILENT':'LIVE · NATIVE ACK';
- stage.dataset.state=!s.ready?'offline':sourcePending?'draft':dirty?'draft':r.mode==='NONE'?'offline':'live';
+ const verified=new Set(portList(s).map(p=>p.port));
+ const validInput=r.mode==='NONE'||
+ (r.mode==='MONO'&&verified.has(r.left)&&r.right===-1)||
+ (r.mode==='STEREO'&&r.left!==r.right&&verified.has(r.left)&&verified.has(r.right));
+ const acceptedValid=!accepted||accepted.mode==='NONE'||
+ (accepted.mode==='MONO'&&verified.has(accepted.left)&&accepted.right===-1)||
+ (accepted.mode==='STEREO'&&accepted.left!==accepted.right&&verified.has(accepted.left)&&verified.has(accepted.right));
+ // Source is real hardware, processing M/ST is independent. A restored
+ // invalid legacy alias is NEVER 'ACK/LIVE', even after a native route ACK.
+ stage.textContent=!s.ready?'NO VERIFIED DEVICE':
+ sourcePending?'PENDING · NATIVE ACK':
+ (!validInput||!acceptedValid)?'INVALID PHYSICAL INPUT · RE-PATCH':
+ dirty?'DRAFT · NOT APPLIED':r.mode==='NONE'?'UNPATCHED · NO INPUT':
+ 'ROUTE ACK · PCM UNVERIFIED';
+ stage.dataset.state=!s.ready?'offline':sourcePending||dirty?'draft':
+ (!validInput||!acceptedValid)?'invalid':r.mode==='NONE'?'offline':'ack';
// Four native AUX destinations are always visible, even when empty.
// Render only after a topology change, never on meter telemetry.
const slots=Array.from({length:4},(_,bus)=>{
@@ -4328,6 +5929,28 @@
if(info.textContent!==caption)info.textContent=caption;
toolbar.querySelector('[data-mix-apply]').disabled=!isNative()||!s.ready||!!s.pending||(!overlay.hidden&&matrixDraft.size>0);
for(const strip of mixer.querySelectorAll('.strip[data-strip]'))refreshStrip(strip,s);
+ // Read-only pinned MAIN route. Reattach on master DOM regeneration but
+ // do not alter its fader, meters, FX, callback or native router.
+ const master=mixer.querySelector('#masterLeft');
+ if(master){
+ let summary=master.querySelector('.arMainOutSummary');
+ if(!summary){
+ summary=node('div','arMainOutSummary');
+ summary.setAttribute('aria-label','Accepted physical MAIN routing');
+ const heading=node('span','arMainOutHeading','MAIN OUT · NATIVE');
+ const output=node('button','arMainOutAction');
+ output.type='button';output.dataset.mixPatch='output';
+ output.dataset.master='1';output.title='Configure physical MAIN L/R (native ACK)';
+ summary.append(heading,output);
+ master.querySelector('.master-ch-id')?.insertAdjacentElement('afterend',summary);
+ }
+ const output=summary.querySelector('.arMainOutAction');
+ if(output){
+ const next=outputLabel(s);
+ if(output.textContent!==next)output.textContent=next;
+ output.disabled=!isNative()||!s.ready;
+ }
+ }
if(!overlay.hidden)refreshIO();
if(!sendEditor.hidden)drawSendEditor();
sofRefresh(s);
@@ -4375,7 +5998,7 @@
const title=node('header','arIOQuickHeader');
const words=node('div','');
words.append(node('strong','','1 · INTERFACE INPUT → MIXER CHANNEL'),
- node('small','','Choose a channel, mono/stereo source and actual driver input(s). STAGE → MUTE → APPLY.'));
+ node('small','','Choose one channel and one or two distinct verified capture pins. USE INPUT commits through native ACK.'));
const jump=node('select','arIOJump');
jump.dataset.ioJump='1';jump.setAttribute('aria-label','Find mixer channel');
for(let i=0;i<10;i++){
@@ -4403,15 +6026,20 @@
for(let i=0;i<10;i++){
const r=channelState(s,i),accepted=s.acceptedRoute?.channels?.[i];
const row=node('div','arIOQuickRow');row.dataset.ioQuickRow=String(i);
+ row.hidden=i!==focusedInput;
row.dataset.state=!s.ready?'offline':valueFor(r)!==valueFor(accepted)?'draft':
r.mode==='NONE'?'empty':'live';
const identity=node('div','arIOQuickIdentity');
identity.append(node('strong','','CH '+String(i+1).padStart(2,'0')),node('small','',matrixLogicalName(i)));
const mode=node('select','arIOQuickMode');mode.dataset.ioQuickMode='1';
mode.setAttribute('aria-label','CH '+(i+1)+' physical input type');
- for(const pair of [['NONE','NO INPUT'],['MONO','MONO'],['STEREO','STEREO'],
+ for(const pair of [['NONE','NO INPUT'],['MONO','MONO'],['STEREO','STEREO · 2 PINS'],
...(r.mode==='BUS'?[['BUS','INTERNAL BUS']]:[])]){
- const option=node('option','',pair[1]);option.value=pair[0];option.selected=r.mode===pair[0];mode.appendChild(option);
+ const option=node('option','',pair[1]);option.value=pair[0];option.selected=r.mode===pair[0];
+ // An accepted legacy invalid stereo route must remain inspectable,
+ // but new STEREO selection requires two distinct enabled driver pins.
+ if(pair[0]==='STEREO'&&verified.length<2&&r.mode!=='STEREO')option.disabled=true;
+ mode.appendChild(option);
}
const left=sourceSelect(i,'left',r.left),right=sourceSelect(i,'right',r.right);
left.disabled=!hardwareReady(s)||r.mode==='NONE'||r.mode==='BUS';
@@ -4421,12 +6049,23 @@
const stage=node('button','btn-180 arIOQuickStage','USE INPUT');
stage.dataset.ioQuickStage='1';stage.type='button';
stage.disabled=!hardwareReady(s)||r.mode==='BUS';
- action.append(stage,node('small','arIOQuickState',r.mode==='BUS'?'INTERNAL BUS':
+ const stereoInvalid=r.mode==='STEREO'&&(!verified.some(p=>p.port===r.left)||
+ !verified.some(p=>p.port===r.right)||r.left===r.right);
+ if(stereoInvalid){
+ row.dataset.state='invalid';
+ // On a one-pin device, the accepted legacy stereo L=R route cannot
+ // be usable stereo. Offer ONE explicit native-safe MONO correction.
+ if(verified.length===1&&verified[0].port===r.left){
+ stage.textContent='FIX AS MONO';stage.dataset.ioQuickFix='1';
+ }
+ }
+ action.append(stage,node('small','arIOQuickState',stereoInvalid?
+ 'INVALID STEREO · SELECT DISTINCT L/R':r.mode==='BUS'?'INTERNAL BUS':
!s.ready?'NO DEVICE':row.dataset.state==='draft'?'DRAFT · NOT LIVE':
- row.dataset.state==='live'?'LIVE · ACK':'UNPATCHED'));
+ row.dataset.state==='live'?'ROUTE ACK · CHECK PCM':'UNPATCHED'));
row.append(identity,mode,left,right,action);section.appendChild(row);
}
- section.appendChild(node('p','arIOQuickFooter','Select verified inputs, click USE INPUT. Native routing handles any required safe mute, ACK and re-arm automatically.'));
+ section.appendChild(node('p','arIOQuickFooter','ONE ACTION: USE INPUT → native safe route/ACK. No input PCM? Send playback into the selected recording endpoint, then check SIGNAL CHECK.'));
return section;
}
function stageQuickInput(button){
@@ -4434,7 +6073,8 @@
const s=route(),pins=new Set(matrixPorts(s,'inputs'));
if(!row||!Number.isInteger(channel)||channel<0||channel>=10||!hardwareReady(s))
return matrixSay('Choose an active driver and wait for any previous APPLY.');
- const mode=row.querySelector('[data-io-quick-mode]').value,
+ const mode=button.dataset.ioQuickFix==='1'?'MONO':
+ row.querySelector('[data-io-quick-mode]').value,
left=Number(row.querySelector('[data-io-quick-pin="left"]').value),
right=Number(row.querySelector('[data-io-quick-pin="right"]').value);
if(mode==='MONO'&&!pins.has(left))return matrixSay('CH '+(channel+1)+' · choose a valid mono input.');
@@ -4856,7 +6496,7 @@
hidden.value=d.backend;panel.appendChild(hidden);
}
const same=deviceSameEndpoint(d),advanced=node('details','arIODeviceAdvanced');
- advanced.appendChild(node('summary','','BUFFER / SAMPLE RATE / HARDWARE PIN ENABLE'));
+ advanced.appendChild(node('summary','','ADVANCED · BUFFER / SAMPLE RATE'));
const fields=node('div','arIODeviceFields');
const rateOpts=[[0,'AUTO · driver default']],bufferOpts=[[0,'AUTO · driver default']];
if(same){
@@ -4871,6 +6511,12 @@
deviceSelect('arIODeviceBuffer',d.bufferSize,bufferOpts,deviceBusy||!isNative())));
advanced.appendChild(fields);
const pins=node('div','arIODevicePins');
+ const pinHeading=node('div','arIOPinHeading');
+ const enabledCount=Array.isArray(d.enabledInputs)?d.enabledInputs.length:0;
+ pinHeading.append(node('strong','','HARDWARE PORTS · ENABLE INPUTS / OUTPUTS'),
+ node('span','',enabledCount+' capture pin(s) selected · '+(enabledCount<2?
+ 'MONO ONLY until a second distinct input is enabled':'MONO / STEREO PAIRS POSSIBLE')));
+ panel.appendChild(pinHeading);
for(const [direction,names,selectedPins] of [
['INPUT',same?a.inputNames:[],d.enabledInputs],
['OUTPUT',same?a.outputNames:[],d.enabledOutputs]]){
@@ -4890,7 +6536,9 @@
});
pins.appendChild(side);
}
- advanced.appendChild(pins);panel.appendChild(advanced);
+ // Input/output pin enabling is a BASIC step, not an advanced matrix.
+ // The original native device draft/ACK path remains unchanged.
+ panel.appendChild(pins);panel.appendChild(advanced);
}
const actions=node('div','arIODeviceActions');
const refresh=node('button','btn-180 arIODeviceRefresh','REFRESH DEVICES');
@@ -4910,9 +6558,18 @@
devicePinNextStep()));
panel.appendChild(actions);body.appendChild(panel);
- const matrixSection=node('section','arIODevicePatchMatrix');
- const heading=node('div','arIODeviceMatrixHeading');
- heading.appendChild(node('strong','','AUDIO I/O · REAL PORT MATRIX'));
+ const matrixSection=node('details','arIODevicePatchMatrix');
+ matrixSection.open=deviceMatrixOpen;
+ matrixSection.addEventListener('toggle',()=>{
+ if(deviceMatrixOpen!==matrixSection.open){
+ deviceMatrixOpen=matrixSection.open;
+ // Expensive crosspoints are constructed on demand, never just hidden
+ // behind CSS while a 12Hz native readback refreshes the device panel.
+ lastSignature='';refreshIO();
+ }
+ });
+ const heading=node('summary','arIODeviceMatrixHeading');
+ heading.appendChild(node('strong','','ADVANCED · HARDWARE PORT MATRIX (OPTIONAL)'));
const tabs=node('div','arIODeviceMatrixSwitch');
for(const [value,label] of [['inputs','INPUTS'],['outputs','OUTPUTS']]){
const b=node('button','arIODeviceMatrixTab',label);b.type='button';
@@ -4921,6 +6578,12 @@
tabs.appendChild(b);
}
heading.appendChild(tabs);matrixSection.appendChild(heading);
+ if(!deviceMatrixOpen){
+ matrixSection.appendChild(node('p','arIODeviceMatrixEmpty',
+ 'Optional engineering crosspoints. Open only for advanced pin patching.'));
+ body.appendChild(matrixSection);
+ return;
+ }
const live=!!d&&deviceSameEndpoint(d)&&a.authorized!==false;
const s=route();
if(deviceMatrixWaitEpoch!==null&&s.epoch!==deviceMatrixWaitEpoch&&s.ready&&s.active)
@@ -4961,7 +6624,10 @@
});
overlay.dataset.activeTab=ioTab;
const matrixInDevice=ioTab==='device'&&deviceSameEndpoint(deviceDraft)&&hardwareReady(s);
- overlay.querySelector('[data-mix-apply]').hidden=ioTab==='device';
+ overlay.querySelector('[data-mix-apply]').hidden=ioTab==='device'||
+ (ioTab==='inputs'&&!advancedMatrixOpen);
+ overlay.querySelector('[data-mix-apply]').textContent=
+ ioTab==='outputs'?'APPLY MAIN OUT':'APPLY ADVANCED';
overlay.querySelector('[data-io-revert]').hidden=ioTab==='device'&&!matrixInDevice;
overlay.querySelector('[data-io-internal]').hidden=ioTab==='device';
overlay.querySelector('[data-io-device-apply]').hidden=ioTab!=='device';
@@ -4987,6 +6653,8 @@
if(previous)advancedMatrixOpen=previous.open;
const previousDirect=body.querySelector('.arIODeviceDirectMatrix');
if(previousDirect)directMatrixOpen=previousDirect.open;
+ const previousHardware=body.querySelector('.arIODevicePatchMatrix');
+ if(previousHardware)deviceMatrixOpen=previousHardware.open;
body.replaceChildren();
if(ioTab!=='device'){
const identity=node('div','arIOHardwareHeader');
@@ -5002,10 +6670,43 @@
body.appendChild(makeQuickInputs(s));
const advanced=node('details','arIOAdvancedMatrix');
advanced.open=advancedMatrixOpen;
- advanced.appendChild(node('summary','','ADVANCED M / L / R CROSSPOINT · SAME NATIVE ROUTING'));
+ advanced.addEventListener('toggle',()=>{
+ advancedMatrixOpen=advanced.open;
+ overlay.querySelector('[data-mix-apply]').hidden=!advanced.open;
+ });
+ advanced.appendChild(node('summary','','ADVANCED · MANUAL INPUT CROSSPOINTS'));
advanced.appendChild(makeMatrix(s,ioTab));
body.appendChild(advanced);
- }else body.appendChild(makeMatrix(s,ioTab));
+ }else{
+ // MAIN Left/Right must be visible before the engineering matrix.
+ // The same __arMixStageMainOutputs owns both paths.
+ const simple=node('section','arIOSimpleMain');
+ simple.append(node('strong','','MAIN OUTPUT · STEREO PAIR'),
+ node('p','','Select two different enabled hardware outputs. APPLY OUTPUT publishes native routing; no browser sound is generated.'));
+ const outputPorts=matrixPorts(s,'outputs');
+ const accepted=s.mainOutputs?.length===2?s.mainOutputs:[];
+ const picked=s.draftMainOutputs?.length===2?s.draftMainOutputs:accepted;
+ const pickers=node('div','arIOSimpleMainRow');
+ for(let side=0;side<2;side++){
+ const label=node('label','arIOSimpleMainField');
+ label.append(node('span','',side===0?'MAIN LEFT':'MAIN RIGHT'));
+ const select=node('select','arIOMainOutput');select.dataset.side=String(side);
+ const empty=node('option','','Choose verified output…');empty.value='-1';select.append(empty);
+ for(const port of outputPorts){
+ const opt=node('option','','HW OUT '+(port+1));opt.value=String(port);
+ opt.selected=port===picked[side];select.appendChild(opt);
+ }
+ select.disabled=!hardwareReady(s)||s.pending||outputPorts.length<2;
+ label.append(select);pickers.append(label);
+ }
+ simple.append(pickers);
+ body.append(simple);
+ const advanced=node('details','arIOAdvancedMatrix');
+ advanced.open=advancedMatrixOpen;
+ advanced.append(node('summary','','ADVANCED · OUTPUT CROSSPOINTS / MONITOR'));
+ advanced.append(makeMatrix(s,ioTab));
+ body.append(advanced);
+ }
}
if(ioTab==='inputs'){
body.appendChild(node('p','arIOHint','MAONO PS22 virtual inputs appear here ONLY if its selected driver enumerates them as capture ports. Configure MAONO Routing Center and select the appropriate PS22 ASIO/recording endpoint in DEVICE / DRIVER. Separate Windows capture endpoints cannot be silently combined into one device. Processing MONO/STEREO is independent of physical source mode.'));
@@ -5043,26 +6744,9 @@
body.appendChild(node('p','arIOHint','LIVE MONITOR: '+
(monitorLive.length===2?'HW '+(monitorLive[0]+1)+'/'+(monitorLive[1]+1):'DISABLED')+
' · Independent POST-fader mix; all changes require MUTE → APPLY → ACK.'));
- const details=node('details','arIOQuickMap');
- details.appendChild(node('summary','','QUICK OUTPUT SELECTION · ACCESSIBLE ALTERNATIVE'));
- const accepted=s.mainOutputs?.length===2?s.mainOutputs:[];
- const draft=s.draftMainOutputs?.length===2?s.draftMainOutputs:accepted;
- const ports=matrixPorts(s,'outputs');
- for(const [i,label] of ['MAIN LEFT','MAIN RIGHT'].entries()){
- const row=node('label','arIOOutputRow');
- const selector=node('select','arIOMainOutput');
- selector.dataset.side=String(i);
- selector.setAttribute('aria-label',label+' destination');
- for(const p of ports){
- const option=node('option','','HW OUT '+(p+1));
- option.value=String(p);option.selected=p===draft[i];selector.appendChild(option);
- }
- selector.disabled=!hardwareReady(s)||ports.length<2;
- row.append(node('strong','',label),selector);details.appendChild(row);
- }
- body.appendChild(details);
- body.appendChild(node('p','arIOHint','LIVE MAIN: '+(accepted.length===2?'HW '+(accepted[0]+1)+'/'+(accepted[1]+1):'UNAVAILABLE')+
- ' · Only native-ACKed MAIN/MONITOR pairs can carry sound. AUX1–4 are internal stereo FX returns, not physical output sockets.'));
+ const acknowledged=s.mainOutputs?.length===2?s.mainOutputs:[];
+ body.appendChild(node('p','arIOHint','NATIVE MAIN: '+(acknowledged.length===2?'HW '+(acknowledged[0]+1)+' / '+(acknowledged[1]+1):'UNAVAILABLE')+
+ ' · Selection is DRAFT until native APPLY/ACK. AUX1–4 are internal FX returns, not hardware ports.'));
}else{
renderCustomDevice(body);
}
@@ -5111,6 +6795,7 @@
}
if(e.target.matches('[data-io-jump]')){
focusedInput=Number(e.target.value);
+ lastSignature='';refreshIO();
overlay.querySelector('[data-io-quick-row="'+focusedInput+'"]')?.scrollIntoView({block:'nearest'});
return;
}
@@ -5176,6 +6861,7 @@
if(!route().ready)openIO('device');
else openSourceChooser(index);
} else if(step==='fx'){
+ // The existing FX-only engineering layer remains an optional inspector.
setMode('FX');
if(typeof chooseChannel==='function')chooseChannel(index);
strip?.querySelector('.rack')?.scrollIntoView?.({block:'nearest',inline:'nearest'});
@@ -5349,6 +7035,7 @@
e.preventDefault();e.stopImmediatePropagation();
const strip=b.closest('[data-strip]'),channel=Number(strip?.dataset.strip)||0;
if(b.dataset.mixPatch==='input')openIO('inputs',channel);
+ else if(b.dataset.mixPatch==='output')openIO('outputs',channel);
else window.__arMixOpenChannelPatch?.(channel,b.dataset.mixPatch);
return;
}
@@ -5536,7 +7223,8 @@
closeSendEditor();
}
},true);
- setMode('FX');
+ // The ACTUAL M4 WebView2 mixer now opens as one integrated operator console.
+ setMode('CONSOLE');
})();
+