diff --git a/AR-MIX-Live-FX-Host-Standalone-v0.3.html b/AR-MIX-Live-FX-Host-Standalone-v0.3.html index b4ad10b4a..6cd757346 100644 --- a/AR-MIX-Live-FX-Host-Standalone-v0.3.html +++ b/AR-MIX-Live-FX-Host-Standalone-v0.3.html @@ -754,7 +754,7 @@ /* Scope-specific ON palette: only variables change; all keys share the same seven-layer pad and exact press recipe above. */ #app .toolbar-actions .nav button.btn-180.selected{ - --b180-color:#f0f1f3;--b180-border:#939ba5;--b180-ink:#222932; + --b180-color:#b9cf77;--b180-border:#708942;--b180-ink:#263319; } #app .left-rail button.btn-180:is(.selected,.active){ --b180-color:var(--b180-on-magenta);--b180-border:#ad6d9f;--b180-ink:#32172f; @@ -765,6 +765,8 @@ } #app .left-rail .rail-presets button.btn-180{text-transform:none} #app .toolbar-actions .nav button.btn-180{height:34px;min-height:34px;min-width:77px;padding:0 10px!important;letter-spacing:.35px!important} +/* The shared OFF selector inherits #masterLeft specificity through :is(). Scope toolbar OFF with explicit state guards, without new !important paint rules. */ +#app .toolbar-actions .nav button.btn-180:not(.selected):not(.active):not(.on):not([aria-pressed="true"]){--b180-color:#adc875;--b180-border:#708942;--b180-ink:#263319} #app .left-rail button.btn-180 > span, #app .toolbar-actions .nav button.btn-180 > span{transform:none!important;transition:none!important} @@ -1103,11 +1105,20 @@ #app #mixer .fader-zone .meter-signal-area .meter-peak{ bottom:0;left:1px;right:1px; } +/* P0: static machined recess and narrow black slit. No blur or pointer listeners. */ #app #mixer .fader-zone .fader:before{ - top:38px;bottom:39px; + top:7px;bottom:7px;left:50%;width:min(44px,100%); + transform:translateX(-50%);border:1px solid #070e13;border-radius:2px; + background:linear-gradient(90deg,#05090c 0%,#0d151a 12%,#18232b 32%,#1b2831 67%,#2a3943 95%,#46545e 100%); + box-shadow:inset 2px 0 3px #000a,inset -1px 0 2px #ffffff12,0 0 0 1px #27333a; + pointer-events:none;box-sizing:border-box; } #app #mixer .fader-zone .fader:after{ - top:38px;bottom:39px; + top:10px;bottom:10px;left:50%;width:6px; + transform:translateX(-50%);border:0;border-radius:1px; + background:linear-gradient(90deg,#000204,#060b0f 26%,#020508 65%,#121e26); + box-shadow:inset 1px 0 1px #000b,1px 0 0 #43515a4d; + pointer-events:none; } #app #mixer .fader-zone .fader-travel{ position:absolute;top:38px;bottom:39px;left:0;right:0; @@ -1491,7 +1502,7 @@ document.querySelectorAll('.strip').forEach(strip=>strip.classList.toggle('selected',strip.id==='masterLeft')); document.querySelectorAll('#channelList [data-choose]').forEach(row=>row.classList.remove('selected')); } -function chooseChannel(i){if(i<0||i>=channels.length){flash('Additional bank channels are not populated in this UI study');return}currentChannel=i;renderMixer();if(view==='FX RACK')renderRackWorkspace()} +function chooseChannel(i){if(i<0||i>=channels.length){flash('Additional bank channels are not populated in this UI study');return}masterSelected=false;currentChannel=i;renderMixer();if(view==='FX RACK')renderRackWorkspace()} function toggleState(i,key){channels[i][key]=!channels[i][key];const btn=document.querySelector(`[data-${key}="${i}"]`);if(btn){btn.classList.toggle('active',channels[i][key]);btn.setAttribute('aria-pressed',String(channels[i][key]))}send(key,channels[i][key],i)} document.addEventListener('click',e=>{const b=e.target.closest('button,[data-choose],[data-scene],[data-group]'); const icon=e.target.closest('[data-icon-choice]'),color=e.target.closest('[data-color-choice]'); @@ -1509,7 +1520,7 @@ 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.masterPower!==undefined){const slot=+b.dataset.masterPower;masterBypassed[slot]=!masterBypassed[slot];renderMaster();persistSession();send('masterFxBypass',{slot,bypass:masterBypassed[slot]},-1);return} + if(b.dataset.masterPower!==undefined){const slot=+b.dataset.masterPower;masterBypassed[slot]=!masterBypassed[slot];renderMaster();if(view==='FX RACK'&&masterSelected)renderMasterRackWorkspace();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} @@ -1716,7 +1727,15 @@ function shiftFxMetaLeft(ch,at,len){for(let i=at;i``).join('')} -function renderRackWorkspace(){let c=channels[currentChannel];let chain=normalChain(c);$('rackWorkspace').innerHTML=`
YOUR SOUND · CORE WORKFLOW

FX Rack — ${safeText(c.name)}

Build your signature vocal sound. Add, reorder, bypass, and store your VST chain.

● AUDIO INPUT · ${safeText(c.name)}
↓
${chain.map((name,i)=>`
${String(i+1).padStart(2,'0')}${safeText(name)}${safeText(pluginCatalog.find(p=>p.name===name)?.hint||'VST3 plugin · mock chain state')}
↓
`).join('')}
↓
◎ OUTPUT · MASTER / STREAM
${pluginEditorIndex!==null&&pluginEditorIndex

Ready-to-use Sound

Start with a preset, then personalize your FX chain. No complex routing required.

${['Clean Vocal','Warm Karaoke','Live Broadcast'].map(s=>``).join('')}

Make it sound better

Recommended signal path:

Noise Gate → EQ → Compressor → De-Esser → Reverb

Demo status

Plugin names and bypass buttons currently change visual state only. Installed VST3 scanning and DSP are scheduled for the native engine phase.

`}`} +function renderMasterRackWorkspace(){ + const chain=masterInserts.filter(Boolean).slice(0,6); + $('rackWorkspace').innerHTML=`
MASTER BUS · UI PREVIEW

FX Rack — MASTER

Native MASTER VST3 processing is not implemented yet.

+
● MIXED INPUTS
↓
+ ${chain.map((name,i)=>`
${String(i+1).padStart(2,"0")}${safeText(name)}Preview FX only
↓
`).join("")} +
↓
◎ MASTER OUTPUT
+

MASTER · PREVIEW

Master FX will become real audio processors after native multi-channel routing is integrated.

`; +} +function renderRackWorkspace(){if(masterSelected){renderMasterRackWorkspace();return;}let c=channels[currentChannel];let chain=normalChain(c);$('rackWorkspace').innerHTML=`
YOUR SOUND · CORE WORKFLOW

FX Rack — ${safeText(c.name)}

Build your signature vocal sound. Add, reorder, bypass, and store your VST chain.

● AUDIO INPUT · ${safeText(c.name)}
↓
${chain.map((name,i)=>`
${String(i+1).padStart(2,'0')}${safeText(name)}${safeText(pluginCatalog.find(p=>p.name===name)?.hint||'VST3 plugin · mock chain state')}
↓
`).join('')}
↓
◎ OUTPUT · MASTER / STREAM
${pluginEditorIndex!==null&&pluginEditorIndex

Ready-to-use Sound

Start with a preset, then personalize your FX chain. No complex routing required.

${['Clean Vocal','Warm Karaoke','Live Broadcast'].map(s=>``).join('')}

Make it sound better

Recommended signal path:

Noise Gate → EQ → Compressor → De-Esser → Reverb

Demo status

Plugin names and bypass buttons currently change visual state only. Installed VST3 scanning and DSP are scheduled for the native engine phase.

`}`} function pluginInspector(ch,slot){const name=normalChain(channels[ch])[slot],v=getFxParams(ch,slot);return `
FX EDITOR · DEMO PARAMETERS

${safeText(name)}

These generic controls demonstrate the editing and preset workflow. The real VST3 editor will replace them when connected.

`} function renderSignalFlow(){$('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.

01 · INPUTMicrophoneAudio Interface
ASIO or WASAPI
➜
02 · FX CHAINVST3 PluginsEQ · Dynamics
Reverb · Delay
➜
03 · MIXERMix & MonitorFader · Pan
Master · Meters
➜
04 · OUTPUTSpeakers / StreamAudio 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.
`} 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()} @@ -1727,7 +1746,7 @@ const slot=pendingMasterSlot; if(slot>=6)return; masterInserts[slot]=name;delete masterBypassed[slot];pendingMasterSlot=null; - closePluginBrowser();renderMaster();persistSession(); + closePluginBrowser();renderMaster();if(view==='FX RACK'&&masterSelected)renderMasterRackWorkspace();persistSession(); send('masterChainChanged',{chain:[...masterInserts]},-1); flash('Master FX updated (GUI preview)');return; } diff --git a/tests/gui_workflow_contract_test.mjs b/tests/gui_workflow_contract_test.mjs index 501c0734a..0d388910f 100644 --- a/tests/gui_workflow_contract_test.mjs +++ b/tests/gui_workflow_contract_test.mjs @@ -64,3 +64,30 @@ test('quantised LED meter avoids redundant raw CSS writes while preserving diagn assert.ok(monitor.includes('const setTextIfChanged=')); assert.ok(bridge.includes('footer.textContent!==text')); }); + + +test('P0 FX Rack allows selection of every channel and MASTER without falsely loading VST3',()=>{ + for(const marker of ['function rackTarget','function rackOptions','function renderPendingRack','function openRackTarget','data-native-rack-open','data-native-routing-pending','id="nativeRackChannel"']){ + assert.ok(bridge.includes(marker),marker); + } + assert.ok(bridge.includes('if(rackTarget()!==0)')); + assert.ok(bridge.includes('openRackTarget("master")')); + assert.ok(bridge.includes('rack.dataset.nativeSig="p0-master-pending"')); + assert.ok(bridge.includes('const signature="p0-unrouted-"+i')); + assert.ok(bridge.includes('if(rack.dataset.nativeSig==="p0-unrouted-"+i)return;'), 'No idle FX rack DOM rewrites'); + assert.ok(bridge.includes('if(rack?.dataset.nativeSig==="p0-master-pending")return;'), 'No idle MASTER rack rewrites'); + assert.ok(app.includes('function renderMasterRackWorkspace')); + assert.ok(app.includes('masterSelected=false;currentChannel=i;renderMixer()')); + assert.ok(cpp.includes('channel == 1'), 'P0 must preserve truthful Channel 1-only native DSP'); +}); +test('P0 selected toolbar pad and fader recess are paint-only refinements',()=>{ + const btn=read('web/styles-src/20-button-180.css'); + const fader=read('web/styles-src/42-mixer-premium.css'); + assert.ok(btn.includes('--b180-color:#b9cf77;--b180-border:#708942;--b180-ink:#263319')); + assert.ok(fader.includes('width:min(44px,100%)')); + assert.ok(fader.includes('width:6px')); + assert.ok(fader.includes('top:7px;bottom:7px')); + assert.ok(fader.includes('pointer-events:none')); + assert.ok(css.includes('transform:translate(-50%,-38px)')); + assert.ok(!fader.includes('backdrop-filter:blur(')); +}); diff --git a/tests/ui_smoke.py b/tests/ui_smoke.py index d2ea743ac..259952ca0 100644 --- a/tests/ui_smoke.py +++ b/tests/ui_smoke.py @@ -285,12 +285,13 @@ def shared_shadow_shape(shadow): mute:grab('[data-mute="0"]'), utility:grab('[data-hpf="0"]')}; }""") - for key in ('nav','rail','mute','utility'): + for key in ('rail','mute','utility'): assert style[key]['face']=='rgb(179, 179, 179)',(key,style) assert style[key]['image']=='none',(key,style) assert style[key]['shadow'].count('rgb')==7,(key,style) assert style[key]['radius']=='3px',(key,style) - assert style['selected']['face']=='rgb(240, 241, 243)',style + assert style['nav']['face']=='rgb(173, 200, 117)',style + assert style['selected']['face']=='rgb(185, 207, 119)',style assert style['railOn']['face']=='rgb(227, 166, 216)',style # Audio Device shares the physical BTN-180 toolbar face and dark ink. # The OFF state is truthful in UI-only preview. Explicitly force ON @@ -299,7 +300,7 @@ def shared_shadow_shape(shadow): devOff=await device.evaluate("""e=>{const s=getComputedStyle(e),t=getComputedStyle(e.querySelector('#headerDriver')), r=e.getBoundingClientRect();return {face:s.backgroundColor,ink:t.color,shadow:s.boxShadow,rect:r.toJSON(), pressed:e.classList.contains('on'),backgroundImage:s.backgroundImage}}""") - assert devOff['face']==style['nav']['face']=='rgb(179, 179, 179)',devOff + assert devOff['face']=='rgb(179, 179, 179)',devOff assert devOff['ink']=='rgb(43, 43, 43)' and devOff['backgroundImage']=='none',devOff assert not devOff['pressed'],devOff await device.evaluate("(e)=>e.classList.add('on')") @@ -348,8 +349,8 @@ def shared_shadow_shape(shadow): const on=document.querySelector('[data-view="FX RACK"]'); const off=document.querySelector('[data-view="MIX"]'); return on.classList.contains('selected') && !off.classList.contains('selected') - && getComputedStyle(on).backgroundColor==='rgb(240, 241, 243)' - && getComputedStyle(off).backgroundColor==='rgb(179, 179, 179)'; + && getComputedStyle(on).backgroundColor==='rgb(185, 207, 119)' + && getComputedStyle(off).backgroundColor==='rgb(173, 200, 117)'; }""") nav=page.locator('[data-view="FX RACK"]') navBefore=await nav.evaluate("(e)=>e.getBoundingClientRect().toJSON()") @@ -973,7 +974,13 @@ async def image_for(selector): assert float(await rail.get_attribute('aria-valuenow'))>baseline,(name,baseline) await page.mouse.up() await page.screenshot(path=str(project/'fader-ui-smoke.png'),full_page=True) + # Native/master-aware rack semantics: explicitly visit MASTER, then CH1. + await page.locator('#masterLeft .ch-id').click() await page.locator('[data-view="FX RACK"]').click() + assert await page.locator('.feature-top h2').inner_text()=='FX Rack — MASTER' + assert await page.locator('.chain-add[data-master-insert]').count()==1 + await page.locator('[data-choose="0"]').click() + assert await page.locator('[data-addplugin]').count()==1 await page.locator('[data-addplugin]').click() await page.locator("#pluginSearch").fill("de-esser") await page.locator('[data-pluginname="De-Esser"]').click() diff --git a/web/app.js b/web/app.js index 6288ee500..84575dc67 100644 --- a/web/app.js +++ b/web/app.js @@ -298,7 +298,7 @@ function focusMaster(){ document.querySelectorAll('.strip').forEach(strip=>strip.classList.toggle('selected',strip.id==='masterLeft')); document.querySelectorAll('#channelList [data-choose]').forEach(row=>row.classList.remove('selected')); } -function chooseChannel(i){if(i<0||i>=channels.length){flash('Additional bank channels are not populated in this UI study');return}currentChannel=i;renderMixer();if(view==='FX RACK')renderRackWorkspace()} +function chooseChannel(i){if(i<0||i>=channels.length){flash('Additional bank channels are not populated in this UI study');return}masterSelected=false;currentChannel=i;renderMixer();if(view==='FX RACK')renderRackWorkspace()} function toggleState(i,key){channels[i][key]=!channels[i][key];const btn=document.querySelector(`[data-${key}="${i}"]`);if(btn){btn.classList.toggle('active',channels[i][key]);btn.setAttribute('aria-pressed',String(channels[i][key]))}send(key,channels[i][key],i)} document.addEventListener('click',e=>{const b=e.target.closest('button,[data-choose],[data-scene],[data-group]'); const icon=e.target.closest('[data-icon-choice]'),color=e.target.closest('[data-color-choice]'); @@ -316,7 +316,7 @@ document.addEventListener('click',e=>{const b=e.target.closest('button,[data-cho 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.masterPower!==undefined){const slot=+b.dataset.masterPower;masterBypassed[slot]=!masterBypassed[slot];renderMaster();persistSession();send('masterFxBypass',{slot,bypass:masterBypassed[slot]},-1);return} + if(b.dataset.masterPower!==undefined){const slot=+b.dataset.masterPower;masterBypassed[slot]=!masterBypassed[slot];renderMaster();if(view==='FX RACK'&&masterSelected)renderMasterRackWorkspace();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} @@ -523,7 +523,15 @@ function shiftFxMetaRight(ch,at,len){for(let i=len;i>at;i--){fxParams[fxKey(ch,i function shiftFxMetaLeft(ch,at,len){for(let i=at;i``).join('')} -function renderRackWorkspace(){let c=channels[currentChannel];let chain=normalChain(c);$('rackWorkspace').innerHTML=`
YOUR SOUND · CORE WORKFLOW

FX Rack — ${safeText(c.name)}

Build your signature vocal sound. Add, reorder, bypass, and store your VST chain.

● AUDIO INPUT · ${safeText(c.name)}
↓
${chain.map((name,i)=>`
${String(i+1).padStart(2,'0')}${safeText(name)}${safeText(pluginCatalog.find(p=>p.name===name)?.hint||'VST3 plugin · mock chain state')}
↓
`).join('')}
↓
◎ OUTPUT · MASTER / STREAM
${pluginEditorIndex!==null&&pluginEditorIndex

Ready-to-use Sound

Start with a preset, then personalize your FX chain. No complex routing required.

${['Clean Vocal','Warm Karaoke','Live Broadcast'].map(s=>``).join('')}

Make it sound better

Recommended signal path:

Noise Gate → EQ → Compressor → De-Esser → Reverb

Demo status

Plugin names and bypass buttons currently change visual state only. Installed VST3 scanning and DSP are scheduled for the native engine phase.

`}`} +function renderMasterRackWorkspace(){ + const chain=masterInserts.filter(Boolean).slice(0,6); + $('rackWorkspace').innerHTML=`
MASTER BUS · UI PREVIEW

FX Rack — MASTER

Native MASTER VST3 processing is not implemented yet.

+
● MIXED INPUTS
↓
+ ${chain.map((name,i)=>`
${String(i+1).padStart(2,"0")}${safeText(name)}Preview FX only
↓
`).join("")} +
↓
◎ MASTER OUTPUT
+

MASTER · PREVIEW

Master FX will become real audio processors after native multi-channel routing is integrated.

`; +} +function renderRackWorkspace(){if(masterSelected){renderMasterRackWorkspace();return;}let c=channels[currentChannel];let chain=normalChain(c);$('rackWorkspace').innerHTML=`
YOUR SOUND · CORE WORKFLOW

FX Rack — ${safeText(c.name)}

Build your signature vocal sound. Add, reorder, bypass, and store your VST chain.

● AUDIO INPUT · ${safeText(c.name)}
↓
${chain.map((name,i)=>`
${String(i+1).padStart(2,'0')}${safeText(name)}${safeText(pluginCatalog.find(p=>p.name===name)?.hint||'VST3 plugin · mock chain state')}
↓
`).join('')}
↓
◎ OUTPUT · MASTER / STREAM
${pluginEditorIndex!==null&&pluginEditorIndex

Ready-to-use Sound

Start with a preset, then personalize your FX chain. No complex routing required.

${['Clean Vocal','Warm Karaoke','Live Broadcast'].map(s=>``).join('')}

Make it sound better

Recommended signal path:

Noise Gate → EQ → Compressor → De-Esser → Reverb

Demo status

Plugin names and bypass buttons currently change visual state only. Installed VST3 scanning and DSP are scheduled for the native engine phase.

`}`} function pluginInspector(ch,slot){const name=normalChain(channels[ch])[slot],v=getFxParams(ch,slot);return `
FX EDITOR · DEMO PARAMETERS

${safeText(name)}

These generic controls demonstrate the editing and preset workflow. The real VST3 editor will replace them when connected.

`} function renderSignalFlow(){$('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.

01 · INPUTMicrophoneAudio Interface
ASIO or WASAPI
➜
02 · FX CHAINVST3 PluginsEQ · Dynamics
Reverb · Delay
➜
03 · MIXERMix & MonitorFader · Pan
Master · Meters
➜
04 · OUTPUTSpeakers / StreamAudio 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.
`} 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()} @@ -534,7 +542,7 @@ function insertPlugin(name){ const slot=pendingMasterSlot; if(slot>=6)return; masterInserts[slot]=name;delete masterBypassed[slot];pendingMasterSlot=null; - closePluginBrowser();renderMaster();persistSession(); + closePluginBrowser();renderMaster();if(view==='FX RACK'&&masterSelected)renderMasterRackWorkspace();persistSession(); send('masterChainChanged',{chain:[...masterInserts]},-1); flash('Master FX updated (GUI preview)');return; } diff --git a/web/bridge.js b/web/bridge.js index 5a2e0b565..acc24ea8a 100644 --- a/web/bridge.js +++ b/web/bridge.js @@ -156,11 +156,39 @@ return `
AR MIX · NATIVE VST3 ENGINE

${escapeHtml(title)}

${escapeHtml(subtitle)}
`; } + function rackTarget(){return typeof masterSelected!=="undefined"&&masterSelected?"master":Math.min(channels.length-1,Math.max(0,currentChannel));} +function rackOptions(){ + const selected=rackTarget(); + return ``; +} +function renderPendingRack(t){ + const label=t==="master"?"MASTER":channels[t]?.name||"Channel"; + workspace.innerHTML=`
+ ${cardHeader("FX Rack · "+label,"Consistent FX workspace · native processing not routed for this channel")} +
${rackOptions()} + + ROUTING PENDING
+

${escapeHtml(label)} · FX CHAIN

+
INPUT NOT ASSIGNED
+
Native VST3 is not available here yet. +

Only Channel 1 has real VST3 DSP. This rack deliberately does not simulate loaded effects or audible routing.

+

Channel/source routing and the MASTER processing graph are scheduled for the native multi-channel implementation.

+ +
NO LIVE FX OUTPUT
`; +} +function openRackTarget(t){ + if(t==="master")focusMaster(); + else{const i=Number(t);if(!Number.isInteger(i)||i<0||i>=channels.length)return;focusChannel(i);} + if(currentTab()!=="FX RACK")document.querySelector('.nav button[data-view="FX RACK"]')?.click(); + renderRack();patchMixer(); +} function renderRack(){ + if(rackTarget()!==0){renderPendingRack(rackTarget());return;} if(!workspace || currentTab()!=="FX RACK") return; workspace.innerHTML=`
${cardHeader("Live FX Chain · Vocal Input","Arrange your real VST3 effects here. Use + ADD FX to choose from your installed catalog.")}
+ ${rackOptions()} @@ -517,24 +545,31 @@ tracks.forEach((track,i)=>{ // The v0.8 Master uses .master-fx-rack, not .rack. Handle it first. if(track.classList.contains("master-strip")){ - track.dataset.preview="1"; - track.title="Master FX and master PAN are visual previews; Master fader and meters are native"; - track.querySelectorAll("[data-master-insert],[data-master-power]").forEach(x=>{ - x.disabled=true;x.title="Preview only — Master FX DSP not yet implemented"; - }); + const rack=track.querySelector(".master-fx-rack"); + if(rack?.dataset.nativeSig==="p0-master-pending")return; // Already patched; no idle DOM work. + track.dataset.preview="1";track.title="MASTER FX: native processing not yet routed"; + if(rack&&rack.dataset.nativeSig!=="p0-master-pending"){ + rack.dataset.nativeSig="p0-master-pending"; + rack.innerHTML=Array.from({length:6},(_,slot)=>`
`).join(""); + } const pan=track.querySelector('[data-pan="master"]'); if(pan){pan.removeAttribute("tabindex");pan.style.pointerEvents="none";pan.title="Master PAN DSP not yet implemented";} const marker=track.querySelector(".master-info-kicker span"); - if(marker && marker.textContent!=="NATIVE PEAKS")marker.textContent="NATIVE PEAKS"; + if(marker&&marker.textContent!=="NATIVE PEAKS")marker.textContent="NATIVE PEAKS"; return; } const rack=track.querySelector(".rack"); if(!rack)return; if(i!==0){ - rack.dataset.preview="1"; - track.dataset.preview="1"; - track.querySelectorAll(".meter-peak").forEach(x=>x.style.display="none"); - track.title=`${track.querySelector(".strip-name")?.textContent?.trim()||"Channel"} — visual preview only; native I/O not wired`; + if(rack.dataset.nativeSig==="p0-unrouted-"+i)return; // No repeat writes/queries on 12Hz status ticks. + track.dataset.preview="1";rack.dataset.preview="1"; + track.title=(channels[i]?.name||"Channel")+" · not connected to native DSP"; + track.querySelectorAll(".meter-peak").forEach(x=>{if(x.style.display!=="none")x.style.display="none";}); + const signature="p0-unrouted-"+i; + if(rack.dataset.nativeSig!==signature){ + rack.dataset.nativeSig=signature; + rack.innerHTML=Array.from({length:6},(_,slot)=>`
`).join(""); + } return; } const signature=state.chain.map(p=>p.id+"|"+p.bypass).join(","); @@ -656,7 +691,7 @@ },true); // Capture native controls before the legacy v0.3 demo handlers. document.addEventListener("click", function(e){ - const el=e.target.closest("[data-native-action],[data-native-add],[data-native-fx],[data-fxpower],[data-master-insert],[data-master-power],[data-native-category],[data-go-native-rack],[data-insert],[data-plugin-picker],[data-plugin-manager],[data-my-sounds],[data-preset-mute],[data-preset-save],[data-preset-load],[data-close-modal],[data-orbit-start],[data-orbit-stop]"); + const el=e.target.closest("[data-native-rack-open],[data-native-action],[data-native-add],[data-native-fx],[data-fxpower],[data-master-insert],[data-master-power],[data-native-category],[data-go-native-rack],[data-insert],[data-plugin-picker],[data-plugin-manager],[data-my-sounds],[data-preset-mute],[data-preset-save],[data-preset-load],[data-close-modal],[data-orbit-start],[data-orbit-stop]"); if(!el)return; e.preventDefault();e.stopImmediatePropagation(); @@ -681,13 +716,12 @@ shape,distanceIndex,elevationIndex,calibrated:orbit.confirmed});return; } if(el.hasAttribute("data-orbit-stop")){send("orbitStop",{slot:orbit.slot});return;} - if(el.hasAttribute("data-master-insert")||el.hasAttribute("data-master-power")){ - toStatus("Master FX is a visual preview; real processing is Channel 1.");return; - } + if(el.hasAttribute("data-native-rack-open")){openRackTarget(el.dataset.nativeRackOpen);return;} + if(el.hasAttribute("data-master-insert")||el.hasAttribute("data-master-power")){openRackTarget("master");return;} if(el.hasAttribute("data-fxpower")){ const [channel,slot]=el.dataset.fxpower.split(":").map(Number); if(channel===0)send("fxBypass",{slot,value:!state.chain[slot]?.bypass}); - else toStatus("Visual preview only. Native FX available on Channel 1."); + else openRackTarget(channel); return; } if(el.hasAttribute("data-my-sounds")){openMySounds();return;} @@ -718,17 +752,12 @@ renderManager();showDialog("nativePluginManager");return; } if(el.hasAttribute("data-plugin-picker")){ + if(rackTarget()!==0){toStatus("FX Rack selected, but native channel routing is not yet available. No VST3 was loaded.");return;} openPicker();return; } if(el.hasAttribute("data-insert")){ - const article=el.closest(".strip"); - const idx=Number(article?.dataset.strip??0); - if(idx!==0){ - const toast=document.querySelector("#toast"); - if(toast){toast.textContent="Native VST3 is currently available on Channel 1 only.";toast.classList.add("show"); - setTimeout(()=>toast.classList.remove("show"),2200);} - return; - } + const idx=Number(el.closest(".strip")?.dataset.strip??0); + if(idx!==0){openRackTarget(idx);return;} openPicker();return; } if(el.hasAttribute("data-go-native-rack")){ @@ -771,6 +800,7 @@ if(fx==="bypass")send("fxBypass",{slot,value:!state.chain[slot]?.bypass}); if(fx==="up"||fx==="down")send("fxMove",{slot,value:fx==="up"?-1:1}); },true); + document.addEventListener("change",function(e){if(e.target?.id==="nativeRackChannel")openRackTarget(e.target.value);},true); document.addEventListener("input", function(e){ if(e.target.id!=="nativeVstSearch")return; state.filter=e.target.value; diff --git a/web/styles-src/20-button-180.css b/web/styles-src/20-button-180.css index fd8296344..eb4bde093 100644 --- a/web/styles-src/20-button-180.css +++ b/web/styles-src/20-button-180.css @@ -145,7 +145,7 @@ /* Scope-specific ON palette: only variables change; all keys share the same seven-layer pad and exact press recipe above. */ #app .toolbar-actions .nav button.btn-180.selected{ - --b180-color:#f0f1f3;--b180-border:#939ba5;--b180-ink:#222932; + --b180-color:#b9cf77;--b180-border:#708942;--b180-ink:#263319; } #app .left-rail button.btn-180:is(.selected,.active){ --b180-color:var(--b180-on-magenta);--b180-border:#ad6d9f;--b180-ink:#32172f; @@ -156,6 +156,8 @@ } #app .left-rail .rail-presets button.btn-180{text-transform:none} #app .toolbar-actions .nav button.btn-180{height:34px;min-height:34px;min-width:77px;padding:0 10px!important;letter-spacing:.35px!important} +/* The shared OFF selector inherits #masterLeft specificity through :is(). Scope toolbar OFF with explicit state guards, without new !important paint rules. */ +#app .toolbar-actions .nav button.btn-180:not(.selected):not(.active):not(.on):not([aria-pressed="true"]){--b180-color:#adc875;--b180-border:#708942;--b180-ink:#263319} #app .left-rail button.btn-180 > span, #app .toolbar-actions .nav button.btn-180 > span{transform:none!important;transition:none!important} diff --git a/web/styles-src/42-mixer-premium.css b/web/styles-src/42-mixer-premium.css index 9e4ed9ebe..cefe7b1a0 100644 --- a/web/styles-src/42-mixer-premium.css +++ b/web/styles-src/42-mixer-premium.css @@ -143,11 +143,20 @@ html:not([data-mixperf="baseline"]):not([data-mixperf="layers-off"]):not([data-m #app #mixer .fader-zone .meter-signal-area .meter-peak{ bottom:0;left:1px;right:1px; } +/* P0: static machined recess and narrow black slit. No blur or pointer listeners. */ #app #mixer .fader-zone .fader:before{ - top:38px;bottom:39px; + top:7px;bottom:7px;left:50%;width:min(44px,100%); + transform:translateX(-50%);border:1px solid #070e13;border-radius:2px; + background:linear-gradient(90deg,#05090c 0%,#0d151a 12%,#18232b 32%,#1b2831 67%,#2a3943 95%,#46545e 100%); + box-shadow:inset 2px 0 3px #000a,inset -1px 0 2px #ffffff12,0 0 0 1px #27333a; + pointer-events:none;box-sizing:border-box; } #app #mixer .fader-zone .fader:after{ - top:38px;bottom:39px; + top:10px;bottom:10px;left:50%;width:6px; + transform:translateX(-50%);border:0;border-radius:1px; + background:linear-gradient(90deg,#000204,#060b0f 26%,#020508 65%,#121e26); + box-shadow:inset 1px 0 1px #000b,1px 0 0 #43515a4d; + pointer-events:none; } #app #mixer .fader-zone .fader-travel{ position:absolute;top:38px;bottom:39px;left:0;right:0; diff --git a/web/styles.css b/web/styles.css index c8a91e769..86b2440fb 100644 --- a/web/styles.css +++ b/web/styles.css @@ -753,7 +753,7 @@ html,body,body *:not(svg):not(path):not(circle):not(rect){ /* Scope-specific ON palette: only variables change; all keys share the same seven-layer pad and exact press recipe above. */ #app .toolbar-actions .nav button.btn-180.selected{ - --b180-color:#f0f1f3;--b180-border:#939ba5;--b180-ink:#222932; + --b180-color:#b9cf77;--b180-border:#708942;--b180-ink:#263319; } #app .left-rail button.btn-180:is(.selected,.active){ --b180-color:var(--b180-on-magenta);--b180-border:#ad6d9f;--b180-ink:#32172f; @@ -764,6 +764,8 @@ html,body,body *:not(svg):not(path):not(circle):not(rect){ } #app .left-rail .rail-presets button.btn-180{text-transform:none} #app .toolbar-actions .nav button.btn-180{height:34px;min-height:34px;min-width:77px;padding:0 10px!important;letter-spacing:.35px!important} +/* The shared OFF selector inherits #masterLeft specificity through :is(). Scope toolbar OFF with explicit state guards, without new !important paint rules. */ +#app .toolbar-actions .nav button.btn-180:not(.selected):not(.active):not(.on):not([aria-pressed="true"]){--b180-color:#adc875;--b180-border:#708942;--b180-ink:#263319} #app .left-rail button.btn-180 > span, #app .toolbar-actions .nav button.btn-180 > span{transform:none!important;transition:none!important} @@ -1102,11 +1104,20 @@ html:not([data-mixperf="baseline"]):not([data-mixperf="layers-off"]):not([data-m #app #mixer .fader-zone .meter-signal-area .meter-peak{ bottom:0;left:1px;right:1px; } +/* P0: static machined recess and narrow black slit. No blur or pointer listeners. */ #app #mixer .fader-zone .fader:before{ - top:38px;bottom:39px; + top:7px;bottom:7px;left:50%;width:min(44px,100%); + transform:translateX(-50%);border:1px solid #070e13;border-radius:2px; + background:linear-gradient(90deg,#05090c 0%,#0d151a 12%,#18232b 32%,#1b2831 67%,#2a3943 95%,#46545e 100%); + box-shadow:inset 2px 0 3px #000a,inset -1px 0 2px #ffffff12,0 0 0 1px #27333a; + pointer-events:none;box-sizing:border-box; } #app #mixer .fader-zone .fader:after{ - top:38px;bottom:39px; + top:10px;bottom:10px;left:50%;width:6px; + transform:translateX(-50%);border:0;border-radius:1px; + background:linear-gradient(90deg,#000204,#060b0f 26%,#020508 65%,#121e26); + box-shadow:inset 1px 0 1px #000b,1px 0 0 #43515a4d; + pointer-events:none; } #app #mixer .fader-zone .fader-travel{ position:absolute;top:38px;bottom:39px;left:0;right:0;