Skip to content
Merged
37 changes: 30 additions & 7 deletions AR-MIX-Live-FX-Host-Standalone-v0.3.html
Original file line number Diff line number Diff line change
Expand Up @@ -2268,11 +2268,14 @@
.arIOSoftwareName{flex-wrap:wrap}

/* P0 independent native PCM / routing / output proof: flat, static, compact. */
.arIOAudioPath{display:grid;grid-template-columns:repeat(3,minmax(0,1fr)) auto;gap:5px;align-items:center;padding:7px 11px;background:#0e2630;border-block:1px solid #3c5b68;color:#c7e0e8;font:10px/1.4 "Segoe UI",sans-serif}
.arIOAudioPath{display:grid;grid-template-columns:repeat(4,minmax(0,1fr)) auto auto;gap:5px;align-items:center;padding:7px 11px;background:#0e2630;border-block:1px solid #3c5b68;color:#c7e0e8;font:10px/1.4 "Segoe UI",sans-serif}
.arIOAudioPath>span{padding:5px 7px;border-left:2px solid #5b91a1;background:#142e39;min-width:0;overflow-wrap:anywhere}
.arIOAudioPath>small{grid-column:1/-1;color:#d9d0ad;font-size:10px;line-height:1.4;overflow-wrap:anywhere}
.arIOAudioPath>button{min-height:26px;white-space:nowrap}
@media(max-width:850px){.arIOAudioPath{grid-template-columns:repeat(2,minmax(0,1fr))}.arIOAudioPath>small{grid-column:1/-1}}
.arIOAudioPath>.arIOPathStart{--b180-color:#9de9c1;--b180-border:#39936f;--b180-ink:#133c2b}
.arIOAudioPath>.arIOPathStart:disabled{opacity:.48;cursor:default}
@media(max-width:950px){.arIOAudioPath{grid-template-columns:repeat(4,minmax(0,1fr))}.arIOAudioPath>button{grid-column:span 2}.arIOAudioPath>small{grid-column:1/-1}}
@media(max-width:650px){.arIOAudioPath{grid-template-columns:repeat(2,minmax(0,1fr))}.arIOAudioPath>button{grid-column:span 1}}
</style></head>
<body>
<div id="app" class="app">
Expand Down Expand Up @@ -3813,15 +3816,27 @@
overlay.innerHTML='<section class="arIOWindow" role="dialog" aria-modal="true" aria-label="ArSonMix hardware audio I/O"><header><div><small>ArSonMiX · AUDIO HARDWARE</small><h2>Audio Setup · Windows Devices & Routing</h2></div><button type="button" class="btn-180" data-io-close aria-label="Close Audio I/O">CLOSE</button></header><div class="arIOTop" id="arIOIdentity"></div><nav role="tablist" aria-label="Audio I/O views"><button class="btn-180 active" role="tab" data-io-tab="device">DEVICE / DRIVER</button><button class="btn-180" role="tab" data-io-tab="inputs">INPUT ROUTING</button><button class="btn-180" role="tab" data-io-tab="outputs">OUTPUT ROUTING</button></nav><div id="arIOBody" class="arIOBody"></div><footer><span id="arIOFeedback" role="status">Hardware changes require native ACK. Output stays MUTED on APPLY.</span><button type="button" class="btn-180" data-io-revert>REVERT DRAFT</button><button type="button" class="btn-180" data-mix-apply>APPLY PATCH</button><button type="button" class="btn-180" data-io-internal>ADVANCED BUS / FX</button><button type="button" class="btn-180" data-io-device-revert hidden>REVERT DEVICE</button><button type="button" class="btn-180 arIODeviceApply" data-io-device-apply hidden>APPLY DEVICE</button></footer></section>';
document.body.appendChild(overlay);
const audioPath=node('div','arIOAudioPath');audioPath.id='arIOAudioPath';
audioPath.innerHTML='<span data-audio-path-input>CAPTURE · WAIT</span><span data-audio-path-route>ROUTE · WAIT</span><span data-audio-path-output>OUTPUT · WAIT</span><button type="button" class="btn-180" data-io-signal-check>OPEN SIGNAL CHECK</button><small data-audio-path-reason role="status"></small>';
audioPath.innerHTML='<span data-audio-path-input>RAW INPUT · WAIT</span><span data-audio-path-route>ROUTE · WAIT</span><span data-audio-path-mixer>MIXER · WAIT</span><span data-audio-path-output>OUTPUT · WAIT</span><button type="button" class="btn-180 arIOPathStart" data-io-start-audio disabled>START AUDIO</button><button type="button" class="btn-180" data-io-signal-check>OPEN SIGNAL CHECK</button><small data-audio-path-reason role="status"></small>';
overlay.querySelector('.arIOWindow').insertBefore(audioPath,el('arIOBody'));
function refreshAudioPath(){
const d=window.__arMixAudioPathView?.(lastStatus);
if(!d)return;
for(const [key,value] of [['input',d.input],['route',d.route],['output',d.output],['reason',d.message]]){
for(const [key,value] of [['input',d.input],['route',d.route],['mixer',d.mixer],['output',d.output],['reason',d.message]]){
const n=audioPath.querySelector('[data-audio-path-'+key+']');
if(n&&n.textContent!==value)n.textContent=value;
}
// Same native START/ACK action as DEVICE/DRIVER. No duplicate host path,
// automatic unmute, optimistic status or periodic full DOM rebuild.
const start=audioPath.querySelector('[data-io-start-audio]');
if(start){
const pending=!!window.__arMixFastAudioState?.().pending;
const label=lastStatus.monitor?'MUTE OUTPUT':pending?'STARTING…':'START AUDIO';
if(start.textContent!==label)start.textContent=label;
start.disabled=startAudioBlocked();
start.setAttribute('aria-label',lastStatus.monitor?
'Mute hardware output immediately':
'Arm verified physical MAIN only after native route ACK');
}
}
// G3: ONE floating inspector follows the selected source/AUX, no new
// DSP graph, no heavyweight matrix, no layout shifts in the MIX strips.
Expand Down Expand Up @@ -4517,6 +4532,16 @@
(deviceSameEndpoint(d)&&
(!pinsEqual(d.enabledInputs,a.enabledInputs)||!pinsEqual(d.enabledOutputs,a.enabledOutputs))));
}
// Shared safety gate for BOTH visible START AUDIO buttons. The top
// transport cannot bypass a staged device change, invalid hardware,
// pending route/FX transaction or the existing native ACK handshake.
function startAudioBlocked(){
if(!isNative())return true;
if(lastStatus.monitor)return false; // emergency physical MUTE always allowed
const quick=window.__arMixFastAudioState?.()||{};
return deviceBusy||!!quick.pending||!deviceInventory?.active?.open||
!deviceSameEndpoint(deviceDraft)||deviceDirty()||!hardwareReady(route());
}
function deviceRefresh(rescan=false){
if(!isNative()||deviceBusy)return;
const now=Date.now();
Expand Down Expand Up @@ -4612,9 +4637,7 @@
const start=node('button','btn-180 arIODeviceStartAudio',
lastStatus.monitor?'MUTE OUTPUT':quick.pending?'STARTING…':'START AUDIO');
start.type='button';start.dataset.ioStartAudio='1';
start.disabled=!isNative()||(!lastStatus.monitor&&(
deviceBusy||!!quick.pending||!a.open||!deviceSameEndpoint(deviceDraft)||
deviceDirty()||!hardwareReady(route())));
start.disabled=startAudioBlocked();
start.setAttribute('aria-label',lastStatus.monitor?'Mute physical output':
'Start verified live routing and arm hardware output');
activeLine.appendChild(start);
Expand Down
30 changes: 29 additions & 1 deletion tests/mixer_io_operator_contract_test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,8 @@ test('FAST1 one gesture uses native routing ACK then fenced physical ARM, with p
assert.match(io,/dataset\.ioStartAudio/);
assert.match(io,/LIVE ON /);
assert.match(io,/ASSIGN CH/);
assert.match(io,/start\.disabled=!isNative\(\)\|\|\(!lastStatus\.monitor/);
assert.match(io,/function startAudioBlocked\(\)/);
assert.match(io,/start\.disabled=startAudioBlocked\(\)/);
assert.match(control,/window\.__arMixStartLiveAudio=/);
assert.match(control,/fastAudioPending=\{phase:"patch"/);
assert.match(control,/if\(verified\)fastAudioArm\(result\)/);
Expand Down Expand Up @@ -453,3 +454,30 @@ test('P0 actual raw PCM before MUTE and native route/output state remain indepen
}
assert.doesNotMatch(io,/new AudioContext\(/);
});


test('P0 First Sound separates RAW capture, post-fader PCM and physical output ARM',()=>{
const css=read('web/mixer-io.css');
const engine=read('src/LiveAudioEngine.h');
const core=read('engine/core/PreparedMixerBlock.h');
const main=read('src/Main.cpp');
assert.match(gui,/data-audio-path-mixer/);
assert.match(gui,/data-io-start-audio disabled/);
assert.match(gui,/function startAudioBlocked\(\)/);
assert.match(gui,/start\.disabled=startAudioBlocked\(\)/);
assert.match(gui,/start\.disabled=startAudioBlocked\(\)/);
assert.match(gui,/window\.__arMixStartLiveAudio\?\.\(\)/);
assert.match(monitor,/window\.__arMixStartLiveAudio=/);
assert.match(monitor,/action:"monitor",value:true/);
assert.match(monitor,/expectedEpoch:Number\(d\.epoch\),expectedRevision:Number\(d\.revision\)/);
assert.match(main,/engine_\.liveOutputArmFault\(\)/);
assert.match(monitor,/const mixed=patched\.some\(i=>Number\(meter\[i\]\)>0\.0002\)/);
assert.match(monitor,/const mainPcm=Number\(d\.peak\)>0\.0002/);
assert.match(monitor,/ArSonMix physical MAIN is SAFE-MUTED/);
assert.match(monitor,/if sound persists|sound must stop|If sound persists/i);
assert.match(engine,/const bool outputPermitted=outputGate\.renderMain/);
assert.match(engine,/if\(!outputGate\.hardware\)/);
assert.match(core,/observed\) observed->channelPeak\[strip\]=peak/);
assert.match(css,/\.arIOAudioPath>\.arIOPathStart/);
assert.doesNotMatch(gui,/new AudioContext|AudioWorklet|processBlock|createPluginInstance/);
});
36 changes: 27 additions & 9 deletions tests/mixer_io_smoke.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,36 @@ async def main():
callbackCount:10,callbackInputChannels:2,inputPeak:0,monitor:false,
dryRoutingLab:{ready:true,hasAcceptedRoute:true}
})""")
assert silent['input']=='NO PCM IN CURRENT BLOCK',silent
assert silent['input']=='NO RAW CAPTURE PCM',silent
assert silent['route']=='NATIVE ROUTE ACK' and silent['output']=='OUTPUT SAFE-MUTED',silent
assert silent['mixer']=='MIXER · WAIT ARM',silent
assert 'CABLE Input' in silent['message'],silent
muted=await page.evaluate("""()=>window.__arMixAudioPathView({
connected:true,inputDevice:'CABLE Output (VB-Audio Virtual Cable)',
callbackCount:11,callbackInputChannels:2,inputPeak:.14,monitor:false,
dryRoutingLab:{ready:true,hasAcceptedRoute:true,
acceptedRoute:{channels:[{mode:'MONO'}]},channelPeaks:[0]}
})""")
assert muted['input']=='RAW CAPTURE PCM',muted
assert muted['mixer']=='MIXER · WAIT ARM' and muted['output']=='OUTPUT SAFE-MUTED',muted
assert 'direct monitor' in muted['message'].lower(),muted
audible=await page.evaluate("""()=>window.__arMixAudioPathView({
connected:true,inputDevice:'CABLE Output (VB-Audio Virtual Cable)',
callbackCount:11,callbackInputChannels:2,inputPeak:.14,monitor:true,
dryRoutingLab:{ready:true,hasAcceptedRoute:true}
callbackCount:11,callbackInputChannels:2,inputPeak:.14,peak:.035,monitor:true,
dryRoutingLab:{ready:true,hasAcceptedRoute:true,
acceptedRoute:{channels:[{mode:'MONO'}]},channelPeaks:[.09]}
})""")
assert audible['input']=='PCM DETECTED' and audible['output']=='OUTPUT ARMED',audible
assert audible['input']=='RAW CAPTURE PCM' and audible['mixer']=='POST-FADER PCM',audible
assert audible['output']=='MAIN PCM · ARMED',audible
assert 'sound must stop' in audible['message'],audible
await page.evaluate("()=>window.__arMixOpenAudioIO('device')")
assert await page.locator('#arIOAudioPath').is_visible()
assert await page.locator('#arIOAudioPath [data-io-signal-check]').is_visible()
assert await page.locator('#arIOAudioPath [data-audio-path-mixer]').is_visible()
assert await page.locator('#arIOAudioPath [data-io-start-audio]').is_visible()
# The test has no authorized device inventory. Top-level START must
# remain disabled and cannot synthesize a hardware ARM.
assert await page.locator('#arIOAudioPath [data-io-start-audio]').is_disabled()
await page.locator('#arIOAudioPath [data-io-signal-check]').click()
assert await page.locator('#arSignalOverlay').evaluate("(e)=>e.classList.contains('open')")
await page.locator('#arSignalClose').click()
Expand Down Expand Up @@ -231,8 +249,8 @@ async def main():
assert await page.locator('.arIODevicePatchMatrix .arIOMatrixCell').count()>0
# FAST1: one gesture un-mutes a previously ACKed real input route;
# hardware action is still fenced to epoch/revision.
assert await page.locator('[data-io-start-audio]').is_visible()
await page.locator('[data-io-start-audio]').click()
assert await page.locator('#arIOAudioPath [data-io-start-audio]').is_visible()
await page.locator('#arIOAudioPath [data-io-start-audio]').click()
arm=await page.evaluate("""()=>window.__armixTestActions.filter(x=>
x.name==='arMixAction'&&x.data.action==='monitor'&&x.data.value===true)""")
assert len(arm)==1,arm
Expand All @@ -242,8 +260,8 @@ async def main():
ok:true,armed:true,deviceEpoch:4,error:''})""")
await page.evaluate("""status=>{status.monitor=true;
window.__armixTestEmit('arMixStatus',status)}""",status)
assert await page.locator('[data-io-start-audio]').inner_text()=='MUTE OUTPUT'
await page.locator('[data-io-start-audio]').click()
assert await page.locator('#arIOAudioPath [data-io-start-audio]').inner_text()=='MUTE OUTPUT'
await page.locator('#arIOAudioPath [data-io-start-audio]').click()
muted=await page.evaluate("""()=>window.__armixTestActions.filter(x=>
x.name==='arMixAction'&&x.data.action==='monitor'&&x.data.value===false)""")
assert len(muted)==1,muted
Expand Down Expand Up @@ -1001,7 +1019,7 @@ async def main():
types:[{name:'ASIO',active:true,separate:false,
inputs:['Mock Interface'],outputs:['Mock Interface']}]
})""")
await qp.locator('[data-io-start-audio]').click()
await qp.locator('#arIOAudioPath [data-io-start-audio]').click()
requests=await qp.evaluate("""()=>window.__armixTestActions.filter(x=>
x.data?.action==='routingDryApply')""")
assert len(requests)==1,requests
Expand Down
7 changes: 5 additions & 2 deletions web/mixer-io.css
Original file line number Diff line number Diff line change
Expand Up @@ -611,8 +611,11 @@
.arIOSoftwareName{flex-wrap:wrap}

/* P0 independent native PCM / routing / output proof: flat, static, compact. */
.arIOAudioPath{display:grid;grid-template-columns:repeat(3,minmax(0,1fr)) auto;gap:5px;align-items:center;padding:7px 11px;background:#0e2630;border-block:1px solid #3c5b68;color:#c7e0e8;font:10px/1.4 "Segoe UI",sans-serif}
.arIOAudioPath{display:grid;grid-template-columns:repeat(4,minmax(0,1fr)) auto auto;gap:5px;align-items:center;padding:7px 11px;background:#0e2630;border-block:1px solid #3c5b68;color:#c7e0e8;font:10px/1.4 "Segoe UI",sans-serif}
.arIOAudioPath>span{padding:5px 7px;border-left:2px solid #5b91a1;background:#142e39;min-width:0;overflow-wrap:anywhere}
.arIOAudioPath>small{grid-column:1/-1;color:#d9d0ad;font-size:10px;line-height:1.4;overflow-wrap:anywhere}
.arIOAudioPath>button{min-height:26px;white-space:nowrap}
@media(max-width:850px){.arIOAudioPath{grid-template-columns:repeat(2,minmax(0,1fr))}.arIOAudioPath>small{grid-column:1/-1}}
.arIOAudioPath>.arIOPathStart{--b180-color:#9de9c1;--b180-border:#39936f;--b180-ink:#133c2b}
.arIOAudioPath>.arIOPathStart:disabled{opacity:.48;cursor:default}
@media(max-width:950px){.arIOAudioPath{grid-template-columns:repeat(4,minmax(0,1fr))}.arIOAudioPath>button{grid-column:span 2}.arIOAudioPath>small{grid-column:1/-1}}
@media(max-width:650px){.arIOAudioPath{grid-template-columns:repeat(2,minmax(0,1fr))}.arIOAudioPath>button{grid-column:span 1}}
30 changes: 25 additions & 5 deletions web/mixer-io.js
Original file line number Diff line number Diff line change
Expand Up @@ -456,15 +456,27 @@
overlay.innerHTML='<section class="arIOWindow" role="dialog" aria-modal="true" aria-label="ArSonMix hardware audio I/O"><header><div><small>ArSonMiX · AUDIO HARDWARE</small><h2>Audio Setup · Windows Devices & Routing</h2></div><button type="button" class="btn-180" data-io-close aria-label="Close Audio I/O">CLOSE</button></header><div class="arIOTop" id="arIOIdentity"></div><nav role="tablist" aria-label="Audio I/O views"><button class="btn-180 active" role="tab" data-io-tab="device">DEVICE / DRIVER</button><button class="btn-180" role="tab" data-io-tab="inputs">INPUT ROUTING</button><button class="btn-180" role="tab" data-io-tab="outputs">OUTPUT ROUTING</button></nav><div id="arIOBody" class="arIOBody"></div><footer><span id="arIOFeedback" role="status">Hardware changes require native ACK. Output stays MUTED on APPLY.</span><button type="button" class="btn-180" data-io-revert>REVERT DRAFT</button><button type="button" class="btn-180" data-mix-apply>APPLY PATCH</button><button type="button" class="btn-180" data-io-internal>ADVANCED BUS / FX</button><button type="button" class="btn-180" data-io-device-revert hidden>REVERT DEVICE</button><button type="button" class="btn-180 arIODeviceApply" data-io-device-apply hidden>APPLY DEVICE</button></footer></section>';
document.body.appendChild(overlay);
const audioPath=node('div','arIOAudioPath');audioPath.id='arIOAudioPath';
audioPath.innerHTML='<span data-audio-path-input>CAPTURE · WAIT</span><span data-audio-path-route>ROUTE · WAIT</span><span data-audio-path-output>OUTPUT · WAIT</span><button type="button" class="btn-180" data-io-signal-check>OPEN SIGNAL CHECK</button><small data-audio-path-reason role="status"></small>';
audioPath.innerHTML='<span data-audio-path-input>RAW INPUT · WAIT</span><span data-audio-path-route>ROUTE · WAIT</span><span data-audio-path-mixer>MIXER · WAIT</span><span data-audio-path-output>OUTPUT · WAIT</span><button type="button" class="btn-180 arIOPathStart" data-io-start-audio disabled>START AUDIO</button><button type="button" class="btn-180" data-io-signal-check>OPEN SIGNAL CHECK</button><small data-audio-path-reason role="status"></small>';
overlay.querySelector('.arIOWindow').insertBefore(audioPath,el('arIOBody'));
function refreshAudioPath(){
const d=window.__arMixAudioPathView?.(lastStatus);
if(!d)return;
for(const [key,value] of [['input',d.input],['route',d.route],['output',d.output],['reason',d.message]]){
for(const [key,value] of [['input',d.input],['route',d.route],['mixer',d.mixer],['output',d.output],['reason',d.message]]){
const n=audioPath.querySelector('[data-audio-path-'+key+']');
if(n&&n.textContent!==value)n.textContent=value;
}
// Same native START/ACK action as DEVICE/DRIVER. No duplicate host path,
// automatic unmute, optimistic status or periodic full DOM rebuild.
const start=audioPath.querySelector('[data-io-start-audio]');
if(start){
const pending=!!window.__arMixFastAudioState?.().pending;
const label=lastStatus.monitor?'MUTE OUTPUT':pending?'STARTING…':'START AUDIO';
if(start.textContent!==label)start.textContent=label;
start.disabled=startAudioBlocked();
start.setAttribute('aria-label',lastStatus.monitor?
'Mute hardware output immediately':
'Arm verified physical MAIN only after native route ACK');
}
}
// G3: ONE floating inspector follows the selected source/AUX, no new
// DSP graph, no heavyweight matrix, no layout shifts in the MIX strips.
Expand Down Expand Up @@ -1160,6 +1172,16 @@
(deviceSameEndpoint(d)&&
(!pinsEqual(d.enabledInputs,a.enabledInputs)||!pinsEqual(d.enabledOutputs,a.enabledOutputs))));
}
// Shared safety gate for BOTH visible START AUDIO buttons. The top
// transport cannot bypass a staged device change, invalid hardware,
// pending route/FX transaction or the existing native ACK handshake.
function startAudioBlocked(){
if(!isNative())return true;
if(lastStatus.monitor)return false; // emergency physical MUTE always allowed
const quick=window.__arMixFastAudioState?.()||{};
return deviceBusy||!!quick.pending||!deviceInventory?.active?.open||
!deviceSameEndpoint(deviceDraft)||deviceDirty()||!hardwareReady(route());
}
function deviceRefresh(rescan=false){
if(!isNative()||deviceBusy)return;
const now=Date.now();
Expand Down Expand Up @@ -1255,9 +1277,7 @@
const start=node('button','btn-180 arIODeviceStartAudio',
lastStatus.monitor?'MUTE OUTPUT':quick.pending?'STARTING…':'START AUDIO');
start.type='button';start.dataset.ioStartAudio='1';
start.disabled=!isNative()||(!lastStatus.monitor&&(
deviceBusy||!!quick.pending||!a.open||!deviceSameEndpoint(deviceDraft)||
deviceDirty()||!hardwareReady(route())));
start.disabled=startAudioBlocked();
start.setAttribute('aria-label',lastStatus.monitor?'Mute physical output':
'Start verified live routing and arm hardware output');
activeLine.appendChild(start);
Expand Down
Loading
Loading