diff --git a/scripts/build_approved_native_gui.py b/scripts/build_approved_native_gui.py
index fc3f502dd..871859770 100644
--- a/scripts/build_approved_native_gui.py
+++ b/scripts/build_approved_native_gui.py
@@ -3,7 +3,7 @@
Calls scripts/build_pages.py to generate the *same* published index.html and
assets. There is no second HTML/CSS assembler, cloned GUI, or alternate skin.
-A nonvisual bridge JS is the only native-specific addition.
+A nonvisual bridge JS and fail-closed native intent hooks are the only additions.
"""
from __future__ import annotations
@@ -23,21 +23,7 @@
NATIVE_ADAPTER = ROOT / "web" / "approved-native-bridge.js"
ADAPTER_MARKER = ('\n'
'\n'
- '\n'
- '')
+ '\n')
SCHEMA = "arsonmix.approved-native-pages-bundle.v2"
@@ -70,10 +56,9 @@ def accepted_pages_html() -> str:
return (build_public_pages(Path(tmp) / "public") / "index.html").read_text("utf-8")
-# Native-only event seam: the original PUBLIC Pages HTML is byte-for-byte
-# unchanged. Insert five small control hooks ONLY into the generated WebView2
-# HTML at native build time. Every anchor must occur exactly once: no silent
-# breakage if Pages GUI source evolves. No extra layout or simulated PCM.
+# Native-only event seam: preserve the public visual hierarchy and DOM while
+# injecting verified JUCE controls. Every anchor is fail-closed and reversible;
+# no divergent layout, fake PCM, or duplicate HTML skin.
NATIVE_EVENT_HOOKS = (
# The mixer shell must remain visible even with zero audio endpoints or
# before the first accepted roster. Native control intents are still
@@ -81,37 +66,8 @@ def accepted_pages_html() -> str:
("Mixer · Reference Session", "Mixer · Native Session"),
("Interactive visual reference. Changes are local to this mockup.", "Preparing native mixer…"),
("SIMULATED METERS · NO REAL AUDIO", "NATIVE AUDIO"),
- # The published /preview/ HTML and its V28 checkpoint are immutable.
- # Change ONLY the compiled native WebView's operator fader travel law.
- # The DSP gain remains exact dB -> 10^(dB/20), and the mapping is
- # invertible at every tick; no new JS audio engine or controller.
- ("function faderPercent(value,isSend){return rangePct(value,-60,isSend?6:10);}\n",
- "const FADER_TAPER=Object.freeze([[-60,0],[-48,15],[-36,27],[-24,39],[-12,54],[-6,65],[0,77],[6,92],[10,100]]);\n"
- "function faderPercent(value,isSend){\n"
- " if(isSend)return rangePct(value,-60,6);\n"
- " const db=Math.max(-60,Math.min(10,Number(value)));\n"
- " for(let i=1;i{\n",
@@ -122,15 +78,6 @@ def accepted_pages_html() -> str:
" return window.__ARMIX_NATIVE_M2__?.inputChoices?.(t)||['None'];\n"
" if(type==='output'&&window.__JUCE__?.backend)\n"
" return window.__ARMIX_NATIVE_M2__?.outputChoices?.(t)||[t.output];\n"),
- (" code+=sectionFx(t)+sectionSend(t);\n",
- " if(t.kind!=='master'){\n"
- " if(!code.endsWith(''))throw Error('Native O1 route anchor drift');\n"
- " const extRow='
EXT'+\n"
- " '
';\n"
- " code=code.slice(0,-6)+extRow+'';\n"
- " }\n"
- " code+=sectionFx(t)+sectionSend(t);\n"),
("function wireGraphCommit(ops,{record=true}={}){\n",
"function wireGraphCommit(ops,{record=true}={}){\n"
" if(window.__JUCE__?.backend){window.__ARMIX_NATIVE_M2__?.consumeWire?.(ops);return false;}\n"),
diff --git a/site/preview-v2/assets/mixer-section-controls.css b/site/preview-v2/assets/mixer-section-controls.css
index 32b30ddd2..e2ac43e89 100644
--- a/site/preview-v2/assets/mixer-section-controls.css
+++ b/site/preview-v2/assets/mixer-section-controls.css
@@ -107,7 +107,7 @@
.console-body .strip .fx-section.is-gain-view,
.console-body .strip .fx-section.is-sof-view{
display:flex;flex-direction:column;min-height:0;overflow:hidden;
- background:linear-gradient(180deg,#21343d,#172832);
+ background:linear-gradient(180deg,#1a2b35,#142630);
}
/* GAIN is one compact hardware control cluster, not a full-width FX surface.
Only these visual tokens vary with viewport height; neither the dial's
@@ -149,12 +149,12 @@
content:"";position:absolute;inset:0;border-radius:50%;
}
.console-body .strip .gain-dial-arc::before{
- background:repeating-conic-gradient(from 225deg,#20372f 0deg 6deg,transparent 6deg 9deg);
+ background:repeating-conic-gradient(from 225deg,#2b4148 0deg 6deg,transparent 6deg 9deg);
-webkit-mask:conic-gradient(from 225deg,#000 0deg 270deg,transparent 270deg 360deg);
mask:conic-gradient(from 225deg,#000 0deg 270deg,transparent 270deg 360deg);
}
.console-body .strip .gain-dial-arc::after{
- background:repeating-conic-gradient(from 225deg,#51f4a0 0deg 6deg,transparent 6deg 9deg);
+ background:repeating-conic-gradient(from 225deg,#81b8c6 0deg 6deg,transparent 6deg 9deg);
-webkit-mask:conic-gradient(from 225deg,#000 0deg calc(135deg + var(--gain-rotation,0deg)),transparent 0deg 360deg);
mask:conic-gradient(from 225deg,#000 0deg calc(135deg + var(--gain-rotation,0deg)),transparent 0deg 360deg);
}
@@ -165,13 +165,13 @@
.console-body .strip .gain-dial-pointer::before{
content:"";position:absolute;top:8%;left:50%;width:3px;height:23%;
transform:translateX(-50%);border-radius:3px;
- background:linear-gradient(90deg,#137a47,#deffe5 47%,#4dffa0);
- box-shadow:0 0 2px #9cffc8,0 0 6px #15ef85,0 0 9px #20d77c8c;
+ background:linear-gradient(90deg,#50727e,#e2f1f5 47%,#8ebdcb);
+ box-shadow:0 0 2px #c2dbe1,0 0 4px #6ca7b76b;
}
.console-body .strip .gain-dial-pointer::after{
content:"";position:absolute;top:7%;left:50%;
width:4px;height:4px;transform:translateX(-50%);border-radius:50%;
- background:#eaffed;box-shadow:0 0 4px 1px #42f9a8;
+ background:#edf6f8;box-shadow:0 0 3px 1px #8ebdcb88;
}
.console-body .strip .gain-dial input{
position:absolute;inset:0;width:100%;height:100%;margin:0;opacity:0;
@@ -179,7 +179,7 @@
cursor:ns-resize;writing-mode:vertical-lr;direction:rtl;pointer-events:none;
}
.console-body .strip .gain-dial:focus-within{
- outline:8px solid #7ce7ba14;outline-offset:-2px;
+ outline:8px solid #8ebdcb18;outline-offset:-2px;
}
.console-body .strip .gain-dial:has(input:disabled){opacity:.55;cursor:not-allowed}
.console-body .strip .gain-dial input:disabled{cursor:not-allowed}
@@ -189,10 +189,10 @@
min-height:var(--gain-lcd-height);
padding:2px 4px;overflow:hidden;border:0;border-radius:5px;
/* An actual recessed black display: no outlined textbox or luminous rim. */
- background:#020503;
+ background:#050d12;
box-shadow:inset 0 3px 5px #000f,inset 2px 0 3px #000b,
inset -2px 0 3px #000b,0 1px 0 #93bba51a;
- color:#74fda0;text-shadow:0 0 5px #43f78b88;
+ color:#a5dae4;text-shadow:0 0 4px #6bafc047;
font:600 12px/17px Consolas,'Lucida Console',monospace;
font-variant-numeric:tabular-nums;letter-spacing:.01em;white-space:nowrap;
}
@@ -209,7 +209,7 @@
.console-body.gain-view-active .section-rail .rail-cell.fx .rail-gain-caption{
display:block;writing-mode:vertical-rl;transform:rotate(180deg);
font:600 11px/1 'Segoe UI',Arial,sans-serif;letter-spacing:.16em;
- color:#b7f2d1;text-shadow:0 0 4px #38ca8a33;
+ color:#afd6df;text-shadow:0 0 3px #6bafc033;
}
@media(max-height:680px){
.console-body .strip .gain-view-body{
@@ -261,3 +261,51 @@
@media(max-height:610px){
.console-body .strip .sof-info small{display:none}
}
+
+/* Console Visual Harmony: ONE geometry contract for /preview/ and JUCE.
+ The native ASIO EXT field is visible but disabled in the browser reference.
+ Preserve collapsed route precedence and the identical rail/master heights. */
+.console-body:not(.collapsed-route){--route-h:94px!important}
+.console-body[data-density="standard"]:not(.collapsed-route){--route-h:91px!important}
+.console-body[data-density="compact"]:not(.collapsed-route){--route-h:81px!important}
+.console-body .external-out-field .route-caption{color:#8baebc}
+.console-body .external-out-field .route-select{border-color:#3f5966;background:#142731}
+.console-body .external-out-field .route-select:disabled{color:#8398a3;opacity:.72;cursor:not-allowed}
+.console-body .external-out-field .route-select[aria-busy="true"]{border-color:#ddb576}
+.console-body .external-out-field .route-select[data-status="NEEDS_REMAP"]{color:#d5aa8b}
+.console-body .external-out-state{font:500 9px/1.2 system-ui,sans-serif;letter-spacing:.025em;color:#aabdc3}
+.console-body .external-out-state:empty{display:none}
+.console-body .external-out-state[data-status="LIVE"]{color:#9bd3b8}
+.console-body .external-out-state[data-status="PENDING"]{color:#e7c081}
+.console-body .external-out-state[data-status="MUTED"]{color:#abbcc2}
+.console-body .external-out-state[data-status="NEEDS_REMAP"]{color:#e0a18b}
+
+/* Shared physical-taper micro-ruler legibility. Owner-frozen fader/PNG asset
+ remains byte-identical; this narrowly scoped type correction prevents
+ -24/-36/-48 dB ink collisions on 1366x768 without moving hardware ticks. */
+.console-body .strip .fader-section .gain-tick span{
+ top:-4.5px!important;
+ line-height:9px!important;
+}
+
+/* Route has four rows in the shared Pages/EXE renderer (title + IN/OUT/EXT).
+ Compact internal spacing rather than clipping the live EXT control or
+ inflating the panel: rail and strip retain their shared 94/91/81px heights. */
+.console-body:not(.collapsed-route) .strip .route-section{
+ padding:2px 6px 2px;gap:1px;
+}
+.console-body[data-density="standard"]:not(.collapsed-route) .strip .route-select{
+ height:21px;
+}
+.console-body[data-density="compact"]:not(.collapsed-route) .strip .route-section{
+ padding:1px 3px;gap:1px;
+}
+.console-body[data-density="compact"]:not(.collapsed-route) .strip .route-top{
+ height:15px;min-height:15px;flex-basis:15px;
+}
+.console-body[data-density="compact"]:not(.collapsed-route) .strip .route-field{
+ min-height:18px;
+}
+.console-body[data-density="compact"]:not(.collapsed-route) .strip .route-select{
+ height:18px;
+}
diff --git a/site/preview-v2/index.html b/site/preview-v2/index.html
index 64eb2b049..1dcc61587 100644
--- a/site/preview-v2/index.html
+++ b/site/preview-v2/index.html
@@ -695,12 +695,31 @@
function formatDb(n){return n<=-60?'-∞':(n>0?'+':'')+Number(n).toFixed(1);}
function panLabel(n){return Number(n)===0?'C':n<0?'L'+Math.abs(n):'R'+n;}
function panStyle(n){const left=Math.min(50,50+n/2),right=Math.max(50,50+n/2);return '--pan-start:'+left+'%;--pan-end:'+right+'%';}
-/* M1: one calibrated linear-dB position model for gain, ruler ticks and
- UI-only dBFS preview. Physical fader travel and actual DSP are untouched. */
+/* One shared visual travel contract for fader, ticks, pointer and detent.
+ dBFS meter calibration is separate; neither GUI is an audio DSP authority. */
const METER_DBFS_MIN=-60, METER_DBFS_MAX=0;
function rangePct(v,min,max){return Math.max(0,Math.min(100,100*(Number(v)-min)/(max-min)));}
function scaleTopPct(db,min,max){return 100-rangePct(db,min,max);}
-function faderPercent(value,isSend){return rangePct(value,-60,isSend?6:10);}
+/* Shared console fader travel law for Pages and JUCE WebView2.
+ Preview and native must display the SAME physical position at equal dB.
+ SEND faders retain their independent -60..+6 linear send law. */
+const FADER_TAPER=Object.freeze([[-60,0],[-48,15],[-36,27],[-24,39],[-12,54],[-6,65],[0,77],[6,92],[10,100]]);
+function faderPercent(value,isSend){
+ if(isSend)return rangePct(value,-60,6);
+ const db=Math.max(-60,Math.min(10,Number(value)));
+ for(let i=1;i{
const major=v!==-6;
- return ''+(major?(v>0?'+'+v:v):'')+'';
+ return ''+(major?(v>0?'+'+v:v):'')+'';
}).join('');
return '
';
+ // Same external-output field and channel geometry in Preview and native.
+ // Browser preview is a non-audio reference: leave hardware controls disabled.
+ if(t.kind!=='master'){
+ const hasNativeOutputs=!!window.__JUCE__?.backend;
+ code+='
EXT'+
+ ''+
+ '
';
+ }
+ code+='
';
code+=sectionFx(t)+sectionSend(t);
code+='
PAN
';
@@ -2141,8 +2170,8 @@
if(!travel||travel.height<=0)return;
const max=Number(input.max)||10,min=Number(input.min)||-60;
const frac=Math.max(0,Math.min(1,(ev.clientY-travel.top)/travel.height));
- let gain=Math.round((max-(max-min)*frac)*10)/10;
- const unityY=travel.top+travel.height*(max/(max-min));
+ let gain=Math.round(faderDbFromTravelPercent(100*(1-frac),max===6)*10)/10;
+ const unityY=travel.top+travel.height*(1-faderPercent(0,max===6)/100);
const tolerance=gesture.unityLatched?FADER_UNITY_RELEASE_PX:FADER_UNITY_CAPTURE_PX;
if(!ev.altKey&&Math.abs(ev.clientY-unityY)<=tolerance){
gain=0;gesture.unityLatched=true;
diff --git a/tests/approved_native_gui_bundle_test.py b/tests/approved_native_gui_bundle_test.py
index 8e6cd958c..98ed40812 100644
--- a/tests/approved_native_gui_bundle_test.py
+++ b/tests/approved_native_gui_bundle_test.py
@@ -22,6 +22,14 @@ def test_native_is_exact_assembled_public_pages_plus_nonvisual_native_seam(self)
approved = (source / "index.html").read_text("utf-8")
native = (out / "index.html").read_text("utf-8")
self.assertEqual(bundle.public_from_native(native), approved)
+ # Structural parity: route/EXT, fader taper and hardware look are
+ # composed once into published Pages, never inserted as native CSS.
+ self.assertIn("external-out-field", approved)
+ self.assertEqual(approved.count("external-out-field"), native.count("external-out-field"))
+ self.assertIn("FADER_TAPER=Object.freeze", approved)
+ self.assertEqual(approved.count("FADER_TAPER=Object.freeze"), 1)
+ self.assertEqual(native.count("FADER_TAPER=Object.freeze"), 1)
+ self.assertNotIn('data-armix-o1="physical-output"', native)
self.assertNotIn("__ARMIX_NATIVE_M2__", approved)
self.assertIn("__ARMIX_NATIVE_M2__", native)
# Never let a missing ASIO driver or delayed native snapshot
diff --git a/tests/approved_native_m2_contract.test.cjs b/tests/approved_native_m2_contract.test.cjs
index 8e09afd3d..02a428f75 100644
--- a/tests/approved_native_m2_contract.test.cjs
+++ b/tests/approved_native_m2_contract.test.cjs
@@ -852,10 +852,11 @@ test("P0 typed mono-stereo, PAN detent, fader geometry & FX failure diagnostics"
const main=read("src/Main.cpp");
const snapshot=read("integration/ApprovedNativeRuntimeSnapshot.h");
const nativeBundle=read("scripts/build_approved_native_gui.py");
- assert.match(nativeBundle,/const FADER_TAPER=Object\.freeze/);
- assert.match(nativeBundle,/function faderDbFromTravelPercent\(percent,isSend\)/);
- assert.match(nativeBundle,/faderDbFromTravelPercent\(100\*\(1-frac\),max===6\)/);
- assert.doesNotMatch(page,/FADER_TAPER/, "public Pages reference remains immutable");
+ assert.match(page,/const FADER_TAPER=Object\.freeze/);
+ assert.match(page,/function faderDbFromTravelPercent\(percent,isSend\)/);
+ assert.match(page,/faderDbFromTravelPercent\(100\*\(1-frac\),max===6\)/);
+ assert.doesNotMatch(nativeBundle,/const FADER_TAPER=Object\.freeze/,
+ "A native-only fader law would break /preview/ parity");
assert.match(bridge,/function previewNativePan\(t,el,event\)/);
assert.match(bridge,/const width=event\.type==="change"\?18:latched\?22:14/);
assert.match(bridge,/readout\.textContent=value===0\?"C"/);
@@ -1772,8 +1773,10 @@ test("M3/V60 Windows bundle dispatches exactly one fader release through native
assert.ok(builder.includes("window.__ARMIX_NATIVE_M2__?.consumeField?.(event);return;"));
assert.ok(!builder.includes("consumeField?.({target:g.input,type:'change'})"),
"V60 source already emits the final change; native must not double-publish");
- assert.ok(builder.includes("faderDbFromTravelPercent(100*(1-frac),max===6)"));
- assert.ok(builder.includes("faderPercent(0,max===6)/100"));
+ assert.ok(preview.includes("faderDbFromTravelPercent(100*(1-frac),max===6)"));
+ assert.ok(preview.includes("faderPercent(0,max===6)/100"));
+ assert.ok(!builder.includes("const FADER_TAPER=Object.freeze"),
+ "Both visual surfaces must use one Pages taper, not another native renderer");
assert.ok(builder.includes("function fxNativeTransactionRequired"));
assert.ok(builder.includes("__ARMIX_NATIVE_SCOPE__"));
assert.ok(bridge.includes("scope.installGraph(nextTracks,nextMaster,edges)"));
@@ -2056,7 +2059,12 @@ test("O2 independent per-track external ASIO transactions and clear rejected ACK
assert.match(src,/if\(!pendingExternal\.has\(id\)\)select\.removeAttribute/);
assert.match(src,/SHARED with /);
assert.match(src,/signals SUM/);
- assert.match(builder,/external-out-state/);
+ const page=read("site/preview-v2/index.html");
+ const css=read("site/preview-v2/assets/mixer-section-controls.css");
+ assert.match(page,/external-out-state/);
+ assert.match(css,/external-out-state/);
+ assert.doesNotMatch(builder,/class=\\\"route-field external-out-field/,
+ "Native should never append its own EXT DOM");
});
test("O2 SOURCE ONLY confirmed ASIO EXTERNAL OUT auto-arms without a second Monitor click",()=>{
@@ -2081,7 +2089,7 @@ test("O2 SOURCE ONLY confirmed ASIO EXTERNAL OUT auto-arms without a second Moni
test("O2 external OUT never reports LIVE while driver output is muted",()=>{
const bridge=read("web/approved-native-bridge.js");
- const css=read("scripts/build_approved_native_gui.py");
+ const css=read("site/preview-v2/assets/mixer-section-controls.css");
assert.match(bridge,/const pcmInstalled=row\?\.status==="LIVE"&&match/);
assert.match(bridge,/next\?\.device\?\.outputArmed===true\?"LIVE":"MUTED"/);
assert.match(bridge,/state==="MUTED"\?"ASIO pair connected/);
diff --git a/tests/native_v60_fader_assembly_contract.py b/tests/native_v60_fader_assembly_contract.py
index 26fee4571..b59cce478 100644
--- a/tests/native_v60_fader_assembly_contract.py
+++ b/tests/native_v60_fader_assembly_contract.py
@@ -17,11 +17,14 @@ def run():
public = bundle.accepted_pages_html()
native = bundle.native_html(public)
assert bundle.public_from_native(native) == public, "Native Pages not reversible"
- assert " let gain=Math.round((max-(max-min)*frac)*10)/10;" in public
- assert " let gain=Math.round(faderDbFromTravelPercent(100*(1-frac),max===6)*10)/10;" in native
- assert " const unityY=travel.top+travel.height*(max/(max-min));" in public
- assert " const unityY=travel.top+travel.height*(1-faderPercent(0,max===6)/100);" in native
- assert "FADER_TAPER=Object.freeze" in native
+ assert "FADER_TAPER=Object.freeze" in public
+ assert public.count("FADER_TAPER=Object.freeze")==1
+ assert native.count("FADER_TAPER=Object.freeze")==1
+ assert " let gain=Math.round(faderDbFromTravelPercent(100*(1-frac),max===6)*10)/10;" in public
+ assert " const unityY=travel.top+travel.height*(1-faderPercent(0,max===6)/100);" in public
+ assert "scaleTopPct(v,-60,gainMax)" not in public
+ assert 'external-out-field' in public and 'external-out-field' in native
+ assert "data-armix-o1" not in native
assert native.count("handleField({target:g.input,type:'change',altKey:!!ev.altKey});")==1
assert native.count("if(window.__JUCE__?.backend){window.__ARMIX_NATIVE_M2__?.consumeField?.(event);return;}")==1
assert "consumeField?.({target:g.input,type:'change'})" not in native
diff --git a/tests/pages_controls_v6_smoke.py b/tests/pages_controls_v6_smoke.py
index e9b824cb6..1a55e96e9 100644
--- a/tests/pages_controls_v6_smoke.py
+++ b/tests/pages_controls_v6_smoke.py
@@ -27,7 +27,7 @@ def assert_ownership():
assert css.count(".mx-hw-row>button.mx-hw-key")>=5
assert "Owner-approved V5" not in css and ".codepen-buttons-wrapper" not in css
assert "filter:blur" not in css.replace(" ","").lower()
- # SOLO/PFL retain SVG masks; MUTE is rendered by CSS only.
+ # V6 SOLO retains its SVG mask; the approved PFL is a semantic key.
assert "!!window.ArSonMixHardwareKeys &&
!!document.querySelector('#tracks .strip[data-id="1"] .mx-mute-face') &&
- document.querySelectorAll('#tracks .strip[data-id="1"] svg.mx-hw-face').length===2""")
+ document.querySelectorAll('#tracks .strip[data-id="1"] svg.mx-hw-face').length===1""")
rows=await page.locator(".mx-hw-row").count()
assert rows>=6,(width,rows)
assert await page.locator(".codepen-buttons-wrapper,.hw-switch-socket").count()==0
@@ -64,7 +64,7 @@ async def assert_mixer(page, width):
const cssFace=e.querySelector('.mx-mute-face');
return {
kind:e.dataset.hwKind,action:e.dataset.action,
- label:svg?.querySelector('mask text')?.textContent||e.querySelector('.mx-mute-legend')?.textContent,
+ label:svg?.querySelector('mask text')?.textContent||e.querySelector('.mx-mute-legend')?.textContent||e.querySelector('.mx-hw-fallback')?.textContent,
masks:svg?.querySelectorAll('mask').length||0,
texts:svg?.querySelectorAll('mask text').length||0,
ambient:!!svg?.querySelector('rect[fill="#edf6fa"]'),
@@ -79,21 +79,26 @@ async def assert_mixer(page, width):
background:s.backgroundImage,focus:e.getAttribute('aria-label')
};
})""")
- assert [d["kind"] for d in details]==["mute","solo","cue"],details
+ assert [d["kind"] for d in details]==["mute","solo","pfl"],details
assert [d["action"] for d in details]==["mute","solo","cue"],details
assert [d["label"] for d in details]==["MUTE","SOLO","PFL"],details
- assert [d["led"] for d in details]==["255,78,90","255,207,68","101,210,236"],details
+ assert [d["led"] for d in details]==["255,78,90","255,207,68","209,224,231"],details
assert details[0]["cssFace"] and details[0]["masks"]==0,details
assert "linear-gradient" in details[0]["faceGradient"],details
assert details[0]["background"]=="none",details
- assert all(d["masks"]==1 and d["texts"]==1 and d["ambient"] and d["cap"] and d["shine"]
- for d in details[1:]),details
+ # V6 source paints SOLO as SVG; approved PFL is an independent semantic
+ # key whose PNG material belongs to the assembled public /preview/.
+ assert details[1]["masks"]==1 and details[1]["texts"]==1,details
+ assert all(details[1][k] for k in ("ambient","cap","shine")),details
+ assert details[2]["masks"]==0 and details[2]["texts"]==0,details
+ assert details[2]["action"]=="cue" and details[2]["label"]=="PFL",details
assert all(abs(d["h"]-29)<.7 and d["w"]>=26 for d in details),details
assert max(d["y"] for d in details)-min(d["y"] for d in details)<.6,details
assert max(d["w"] for d in details)-min(d["w"] for d in details)<1.7,details
assert all(details[i]["x"]+details[i]["w"]<=details[i+1]["x"]+.3 for i in range(2)),details
assert all(d["filter"]=="none" for d in details),details
- assert all(d["glow"]=="0" and d["lamp"]=="0" for d in details[1:]),details
+ assert details[1]["glow"]=="0" and details[1]["lamp"]=="0",details
+ assert details[2]["glow"]=="0" and details[2]["lamp"] is None,details
assert all(d["focus"] for d in details),details
before=await keys.nth(0).evaluate("(e)=>getComputedStyle(e.querySelector('.mx-mute-face'),'::before').backgroundImage")
await keys.nth(0).hover()
@@ -115,8 +120,9 @@ async def assert_mixer(page, width):
};
})""")
assert on[0]["face"] and on[0]["legend"]=="rgb(242, 231, 231)",on
- assert all(x["glow"]=="1" and x["lamp"]=="1" for x in on[1:]),on
- assert [x["rgb"] for x in on[1:]]==["rgb(255, 207, 68)","rgb(101, 210, 236)"],on
+ assert on[1]["glow"]=="1" and on[1]["lamp"]=="1",on
+ assert on[2]["glow"]=="1" and on[2]["lamp"] is None,on
+ assert [x["rgb"] for x in on[1:]]==["rgb(255, 207, 68)",None],on
if width==1680:
await page.screenshot(path="pages-mixer-v6-ON-1680.png")
await keys.nth(0).click()
@@ -126,7 +132,7 @@ async def assert_mixer(page, width):
await page.locator('#tracks .strip[data-id="1"] button[data-action="solo"]').click()
await page.wait_for_function("""()=>{
const row=document.querySelector('#tracks .strip[data-id="1"] .mx-hw-row');
- return !!row?.querySelector('.mx-mute-face') && row.querySelectorAll('svg.mx-hw-face').length===2;
+ return !!row?.querySelector('.mx-mute-face') && row.querySelectorAll('svg.mx-hw-face').length===1;
}""")
assert await page.locator('#tracks .strip[data-id="1"] .mx-hw-row>button').count()==3
@@ -143,7 +149,7 @@ async def main():
assert not errors,(width,errors)
await page.close()
await browser.close()
- print("PASS: CSS-built MUTE, V6 SOLO/PFL masked icons, stable 29px keys, OFF/ON toggle, WIRE intact")
+ print("PASS: MUTE CSS, SOLO SVG, PFL semantics, stable 29px hardware keys, OFF/ON and WIRE")
if __name__=="__main__":
asyncio.run(main())
diff --git a/tests/pages_inter_utility_v7_smoke.py b/tests/pages_inter_utility_v7_smoke.py
index 14762750b..a86585f67 100644
--- a/tests/pages_inter_utility_v7_smoke.py
+++ b/tests/pages_inter_utility_v7_smoke.py
@@ -116,15 +116,21 @@ async def visual(page,width):
assert await row.locator('[data-util-kind="fx-main"]').get_attribute('aria-pressed')==before
if width==1680:
await page.screenshot(path='pages-v7-embedded-inter-utility-1680.png')
- # MUTE is an independent CSS/HTML caption; SOLO/PFL retain SVG masks.
- for k in ('mute','solo','cue'):
+ # Historic seed uses a semantic PFL button (action=cue), not the
+ # removed hw-kind=cue. The shipped /preview/ assembler supplies approved
+ # PNG hardware sprites; never demand an obsolete SVG face from this seed.
+ for k in ('mute','solo','pfl'):
key=row.locator(f'.mx-hw-row button[data-hw-kind="{k}"]')
- assert await key.count()==1
+ assert await key.count()==1, (width,k,'approved semantic key missing')
if k=='mute':
assert await key.locator('.mx-mute-face .mx-mute-legend').inner_text()=='MUTE'
assert await key.locator('svg,img').count()==0
- else:
+ elif k=='solo':
assert await key.locator('svg.mx-hw-face mask text').count()==1
+ else:
+ assert await key.get_attribute('data-action')=='cue'
+ assert await key.locator('.mx-hw-fallback').inner_text()=='PFL'
+ assert await key.locator('svg.mx-hw-face').count()==0
async def main():
source_contract()
diff --git a/tests/pages_m1_meter_gain_calibration_smoke.py b/tests/pages_m1_meter_gain_calibration_smoke.py
index ff075e657..628095a53 100644
--- a/tests/pages_m1_meter_gain_calibration_smoke.py
+++ b/tests/pages_m1_meter_gain_calibration_smoke.py
@@ -98,8 +98,19 @@ def geometry(page, density, label):
gain_values=[10,0,-6,-12,-24,-36,-48,-60]
vu_values=[0,-6,-12,-18,-24,-36,-48,-60]
assert len(out["gain"])==8 and len(out["vu"])==8
+ # The single approved Pages/native fader uses a calibrated, monotonic
+ # physical travel taper, NOT the old linear-dB ruler. Derive the expected
+ # positions independently of the UI's faderPercent implementation so a
+ # visible mismatch between tick, pointer and 0 dB detent still fails.
+ taper=[(-60,0),(-48,15),(-36,27),(-24,39),(-12,54),
+ (-6,65),(0,77),(6,92),(10,100)]
+ def fader_top(db):
+ for (lo_db,lo_pct),(hi_db,hi_pct) in zip(taper,taper[1:]):
+ if db<=hi_db:
+ return 100-(lo_pct+(db-lo_db)*(hi_pct-lo_pct)/(hi_db-lo_db))
+ return 0
for item,db in zip(out["gain"],gain_values):
- expected=(10-db)/70*100
+ expected=fader_top(db)
close(item["top"],expected,.03)
close(item["y"],out["travel"]["y"]+out["travel"]["h"]*expected/100,.8)
for item,db in zip(out["vu"],vu_values):
diff --git a/tests/pages_mute_css_reference_smoke.py b/tests/pages_mute_css_reference_smoke.py
index 16b24090c..8f97fd515 100644
--- a/tests/pages_mute_css_reference_smoke.py
+++ b/tests/pages_mute_css_reference_smoke.py
@@ -78,13 +78,14 @@ async def state():
off2=await state()
assert off2["pressed"]=="false" and off2["faceBg"]==off["faceBg"],off2
assert off2["lamp"]!="none" and off2["lowerReflection"]=="0",off2
- # SOLO and PFL are independent from the MUTE material and state.
+ # SOLO still has V6 SVG; PFL is its own semantic button with PNG
+ # material in the compiled /preview/, not a synthetic SVG face here.
siblings=await page.locator('#tracks .strip[data-id="1"] .mx-hw-row>button').evaluate_all(
"xs=>xs.map(x=>({action:x.dataset.action,hasSVG:!!x.querySelector('svg.mx-hw-face')}))")
assert siblings==[
{"action":"mute","hasSVG":False},
{"action":"solo","hasSVG":True},
- {"action":"cue","hasSVG":True},
+ {"action":"cue","hasSVG":False},
],siblings
diff --git a/tests/pages_v60_fader_wire_tactile_smoke.py b/tests/pages_v60_fader_wire_tactile_smoke.py
index 75ea14eca..c06783394 100644
--- a/tests/pages_v60_fader_wire_tactile_smoke.py
+++ b/tests/pages_v60_fader_wire_tactile_smoke.py
@@ -101,7 +101,8 @@ def exercise(page,width,height):
travel=strip.locator(".fader-travel").bounding_box()
fader=strip.locator('input[data-field="level"]')
x=box["x"]+box["width"]/2
- zero=travel["y"]+travel["height"]*(10/70)
+ # Shared Pages/native physical taper positions unity at 77% of travel.
+ zero=travel["y"]+travel["height"]*(1-77/100)
page.mouse.move(x,zero+5)
page.mouse.down()
assert abs(float(fader.input_value()))<.001,(width,"unity detent failed")
diff --git a/tests/preview_v2_v7_visual_smoke.py b/tests/preview_v2_v7_visual_smoke.py
index 9f9f4d10e..c1f474f00 100644
--- a/tests/preview_v2_v7_visual_smoke.py
+++ b/tests/preview_v2_v7_visual_smoke.py
@@ -42,7 +42,9 @@ def audit_geometry(page, title):
if(a!==b)problems.push('top/bottom channel color mismatch '+tag);
}
const controls=[...t.querySelectorAll('.switch-section.mx-hw-row > button.mx-hw-key')];
- if(controls.length!==3)problems.push('MUTE/SOLO/PFL count !=3 '+tag);
+ // MASTER is the approved two-key MUTE/SOLO strip, never PFL.
+ const expectedKeys=t.classList.contains('master')?2:3;
+ if(controls.length!==expectedKeys)problems.push('MUTE/SOLO/PFL count !='+expectedKeys+' '+tag);
else {
if(Math.max(...controls.map(c=>r(c).width))-Math.min(...controls.map(c=>r(c).width))>1.8)
problems.push('inconsistent V6 button widths '+tag);
diff --git a/tests/sof_contextual_console_smoke.py b/tests/sof_contextual_console_smoke.py
index 79156a5ab..a2588884d 100644
--- a/tests/sof_contextual_console_smoke.py
+++ b/tests/sof_contextual_console_smoke.py
@@ -54,6 +54,16 @@ def run() -> None:
page.goto(html.as_uri())
first = page.locator('#tracks .strip[data-id="1"]')
first.wait_for(timeout=15000)
+ ext = first.locator('.external-out-field [data-field="external"]')
+ assert ext.count() == 1 and ext.is_disabled(), (
+ "Preview must share native EXT geometry without fake hardware access")
+ route = first.locator(".route-section").bounding_box()
+ rail = page.locator(".section-rail .rail-cell.route").bounding_box()
+ assert route and rail and abs(route["height"] - rail["height"]) <= 1, (
+ "Route rail/strip height must match", width, route, rail)
+ assert abs(route["height"] - 94) <= 1, (
+ "Route must reserve same third row as native", width, route)
+ assert page.locator("#master .external-out-field").count() == 0
gain = page.locator("#gainView")
fx = page.locator("#fxView")
assert gain.get_attribute("aria-pressed") == "false"
@@ -109,7 +119,7 @@ def run() -> None:
assert "radial-gradient" in leds["cap"], leds
assert "conic-gradient" in leds["inactiveMask"], leds
assert "conic-gradient" in leds["activeMask"], leds
- assert "rgb(32, 55, 47)" in leds["inactive"], leds
+ assert "rgb(43, 65, 72)" in leds["inactive"], leds
pointer = first.locator(".gain-dial-pointer")
before_turn = pointer.evaluate("el => getComputedStyle(el).transform")
before_led_mask = arc.evaluate("el => getComputedStyle(el, '::after').maskImage")
@@ -132,9 +142,9 @@ def run() -> None:
radius: getComputedStyle(el).borderRadius,
shadow: getComputedStyle(el).boxShadow
})""")
- assert lcd_skin["background"] == "rgb(2, 5, 3)", (width, lcd_skin)
+ assert lcd_skin["background"] == "rgb(5, 13, 18)", (width, lcd_skin)
assert lcd_skin["backgroundImage"] == "none", (width, lcd_skin)
- assert lcd_skin["text"] == "rgb(116, 253, 160)", (width, lcd_skin)
+ assert lcd_skin["text"] == "rgb(165, 218, 228)", (width, lcd_skin)
assert lcd_skin["border"] == "0px", (width, lcd_skin)
assert lcd_skin["radius"] == "5px", (width, lcd_skin)
assert "inset" in lcd_skin["shadow"], (width, lcd_skin)
@@ -180,8 +190,10 @@ def run() -> None:
})""")
assert focused_css["width"] == "8px", focused_css
assert focused_css["offset"] == "-2px", focused_css
- assert "0.078" in focused_css["color"] or (
- "0.08" in focused_css["color"]), focused_css
+ assert focused_css["color"].startswith(
+ "rgba(142, 189, 203, "), focused_css
+ focus_alpha=float(focused_css["color"].rsplit(",", 1)[1].strip(" )"))
+ assert 0.08 <= focus_alpha <= 0.12, focused_css
# Strong hysteresis: capture ±1.6, hold until ±3.2.
# Keyboard/Shift can deliberately escape the notch.
def set_gain(value, field_type="input"):