diff --git a/site/preview-v2/assets/arson-vocal-hardware-encoder.svg b/site/preview-v2/assets/arson-vocal-hardware-encoder.svg new file mode 100644 index 000000000..2cb7d175f --- /dev/null +++ b/site/preview-v2/assets/arson-vocal-hardware-encoder.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/site/preview-v2/assets/arson-vocal-hardware-push.svg b/site/preview-v2/assets/arson-vocal-hardware-push.svg new file mode 100644 index 000000000..1b9970a96 --- /dev/null +++ b/site/preview-v2/assets/arson-vocal-hardware-push.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/site/preview-v2/assets/arson-vocal-hardware-rotor.svg b/site/preview-v2/assets/arson-vocal-hardware-rotor.svg new file mode 100644 index 000000000..e8c72a55e --- /dev/null +++ b/site/preview-v2/assets/arson-vocal-hardware-rotor.svg @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/preview-v2/assets/arson-vocal-hardware-toggle.svg b/site/preview-v2/assets/arson-vocal-hardware-toggle.svg new file mode 100644 index 000000000..d3aad9aa7 --- /dev/null +++ b/site/preview-v2/assets/arson-vocal-hardware-toggle.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/site/preview-v2/assets/arson-vocal-throw-performance.svg b/site/preview-v2/assets/arson-vocal-throw-performance.svg new file mode 100644 index 000000000..c3622667a --- /dev/null +++ b/site/preview-v2/assets/arson-vocal-throw-performance.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/site/preview-v2/assets/mixer-fx-rack.css b/site/preview-v2/assets/mixer-fx-rack.css index f1e6baf2b..f5bb4eb10 100644 --- a/site/preview-v2/assets/mixer-fx-rack.css +++ b/site/preview-v2/assets/mixer-fx-rack.css @@ -398,107 +398,234 @@ .mx-comp{top:4px;max-height:calc(100dvh - 8px)} } -/* ArSon Vocal Throw: refined compact concert-FX surface. The exact - Close/Power hit boxes, icon glyph and state paint are NOT owned here: - mixer-contextual-buttons.css owns them jointly with EQ and Compressor. */ -.mx-vthrow{position:fixed;z-index:15001;left:clamp(8px,12vw,190px);top:clamp(8px,11vh,100px); - width:min(438px,calc(100vw - 16px));max-height:calc(100dvh - 16px);display:flex;flex-direction:column; - overflow:hidden;box-sizing:border-box;border:1px solid #3d5969;border-radius:8px; - background:linear-gradient(140deg,#1b303d 0%,#11232f 62%,#142734 100%);color:#e2edf3; - box-shadow:inset 0 1px #ffffff18,0 2px 6px #0009,0 20px 58px #030b13d9; +/* Vocal Throw M4 — aligned studio-hardware faceplate. + One spacing grid, one encoder body, one fixed 260deg rounded level arc. + Close/Power remain the same approved EQ/Compressor shared controls. */ +.mx-vthrow{position:fixed;z-index:15001;top:clamp(7px,7vh,66px);left:clamp(7px,9vw,175px); + width:min(778px,calc(100vw - 14px));max-height:calc(100dvh - 14px);display:flex;flex-direction:column; + box-sizing:border-box;overflow:hidden;border:1px solid #505763;border-radius:9px;color:#d5dce5; + background:linear-gradient(155deg,#323740,#242931 60%,#20252d); + box-shadow:inset 0 1px #ffffff21,inset 0 -1px #090c1199,0 18px 50px #000c; font:400 11px/1.35 Inter,'Segoe UI',sans-serif} .mx-vthrow[hidden]{display:none}.mx-vthrow *{box-sizing:border-box} -.mx-vthrow header{display:flex;flex:0 0 38px;align-items:center;gap:8px;min-width:0;padding:0 8px 0 13px; - background:linear-gradient(180deg,#2b414e,#1c303e);border-bottom:1px solid #4a6574; - cursor:move;touch-action:none;user-select:none;box-shadow:inset 0 1px #ffffff16} -.mx-vthrow .brand{display:inline-flex;align-items:baseline;gap:7px;flex:0 0 auto;white-space:nowrap} -.mx-vthrow .brand-mark{font-size:9px;font-weight:670;letter-spacing:.12em;color:#6dd3d9} -.mx-vthrow .brand-name{font-size:11px;font-weight:570;letter-spacing:.032em;color:#f0f6fa} -.mx-vthrow .channel{min-width:0;flex:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:#8fb0c0;font-size:10px} -.mx-vthrow select,.mx-vthrow input{min-height:26px;max-width:100%;border:1px solid #476172;border-radius:4px; - background:linear-gradient(#152a37,#10232f);color:#ecf6f9;font:inherit;outline:none} -.mx-vthrow select{padding:2px 5px;cursor:pointer} -.mx-vthrow input[type=number]{width:100%;padding:4px 7px;text-align:left;font-variant-numeric:tabular-nums} -.mx-vthrow :is(select,input,button,summary):focus-visible{outline:2px solid #8bdde6;outline-offset:2px} -.mx-vthrow #vtPreset{width:103px;min-width:0;max-width:103px;flex:0 1 103px;margin-left:auto;font-size:10px; - background:linear-gradient(#2d4653,#213b4a)} -.mx-vthrow option{color:#e9f4f7;background:#1c3341} -.mx-vthrow .body{min-height:0;overflow:auto;overscroll-behavior:contain;padding:12px 13px 11px; - display:grid;gap:9px;scrollbar-color:#3e5a67 #162835;scrollbar-width:thin} -.mx-vthrow .lcd{position:relative;min-width:0;display:grid;gap:5px;padding:10px 13px 8px;border:1px solid #355969; - border-radius:5px;background:radial-gradient(ellipse 80% 60% at 50% 0%,#1b475477,transparent), - linear-gradient(165deg,#0b1d27,#0a202c 55%,#0d2632); - box-shadow:inset 0 1px 8px #0009,inset 0 -1px #41667456,0 1px #ffffff0d;overflow:hidden} -.mx-vthrow .lcd::before{content:"";pointer-events:none;position:absolute;inset:0 0 auto;height:1px; - background:linear-gradient(90deg,transparent,#7ab5c455,transparent)} -.mx-vthrow .lcd-top{display:flex;justify-content:space-between;align-items:center;gap:8px;min-width:0; - color:#6994a8;font-size:9px;letter-spacing:.095em} -.mx-vthrow #vtClockLabel{color:#7dcbcc;white-space:nowrap;font-size:9px;font-weight:580} -.mx-vthrow .lcd-numbers{display:flex;align-items:baseline;gap:8px;min-height:45px} -.mx-vthrow #vtDisplayBpm{color:#d9fff1;font:500 36px/1.1 'Segoe UI',Inter,sans-serif; - font-variant-numeric:tabular-nums;letter-spacing:-.045em;text-shadow:0 0 18px #66e7ce2b} -.mx-vthrow .lcd-unit{color:#84b6bd;font-size:10px;letter-spacing:.13em} -.mx-vthrow .lcd-division{margin-left:auto;color:#c1dce7;font-size:10px;letter-spacing:.05em;white-space:nowrap} -.mx-vthrow .lcd-beats{height:9px;display:flex;align-items:center;gap:5px;justify-content:flex-end; - padding-top:6px;border-top:1px solid #37526177} -.mx-vthrow .lcd-beats i{height:3px;width:21px;display:block;border-radius:2px;background:#2e4a56; - box-shadow:inset 0 1px #ffffff08} -.mx-vthrow .lcd-beats i[data-on="true"]{background:linear-gradient(90deg,#3e8c94,#6cc8c7)} -.mx-vthrow .lcd-beats[data-playing=true] i[data-on="true"]{background:linear-gradient(90deg,#5baaa2,#b1eac5)} -.mx-vthrow .row{display:flex;justify-content:space-between;align-items:center;gap:10px;min-width:0} -.mx-vthrow .row #vtMode{width:160px;background:linear-gradient(#273e4c,#182d39);font-size:11px} -.mx-vthrow .topline{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:8px} -.mx-vthrow .field{display:grid;gap:4px;min-width:0} -.mx-vthrow :is(label,.label){font-size:9px;letter-spacing:.075em;color:#8aafc1;font-weight:530} -.mx-vthrow .field input,.mx-vthrow .field select{height:29px;font-size:12px} -.mx-vthrow .music-source{min-width:0;display:grid;grid-template-columns:minmax(0,1fr) minmax(0,1fr); - column-gap:11px;row-gap:5px;align-items:center;padding:9px 0 2px;border-top:1px solid #324c5b} -.mx-vthrow .music-source label{grid-column:1/-1} -.mx-vthrow .music-source select{width:100%;min-width:0} -.mx-vthrow .music-status{min-width:0;color:#8fc7d1;font-size:10px;overflow:hidden; - white-space:nowrap;text-overflow:ellipsis;font-variant-numeric:tabular-nums} -.mx-vthrow button:not(#vtPower):not(#vtClose){font:inherit;cursor:pointer;color:#dceef3; - border:1px solid #4a6977;border-radius:4px;background:linear-gradient(#2c4654,#203b49); - box-shadow:inset 0 1px #ffffff17,0 1px 2px #06121a60} -.mx-vthrow button:not(#vtPower):not(#vtClose):hover:not(:disabled){border-color:#6794a4; - background:linear-gradient(#365c6c,#2a4c5c)} -.mx-vthrow button:disabled{opacity:.52;cursor:not-allowed} -.mx-vthrow .manual{display:grid;grid-template-columns:minmax(0,1fr) 88px;gap:8px} -.mx-vthrow button.throw{min-height:44px;font-size:13px!important;font-weight:650!important; - letter-spacing:.15em;color:#eaffff!important;border-color:#3d8b95!important; - background:linear-gradient(180deg,#20849a,#16677d 72%,#11556a)!important; - box-shadow:inset 0 1px #9de7ef49,0 2px 5px #00131e9c!important} -.mx-vthrow button.throw:hover:not(:disabled){background:linear-gradient(#299db1,#1c8298)!important} -.mx-vthrow button.throw:active:not(:disabled){background:linear-gradient(#155e70,#1d7c8d)!important; - box-shadow:inset 0 2px 5px #081c29!important} -.mx-vthrow button.tap{min-height:44px;letter-spacing:.035em} -.mx-vthrow .hint{min-height:14px;color:#8eaebb;font-size:10px;white-space:nowrap; - overflow:hidden;text-overflow:ellipsis} -.mx-vthrow .detail{padding:7px 0 0;border-top:1px solid #2e4755} -.mx-vthrow details>summary{padding:2px 0 7px;cursor:pointer;color:#b5d5df;font-size:10px} -.mx-vthrow .ranges{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:9px 15px;padding:3px 0 5px} -.mx-vthrow .range{display:grid;grid-template-columns:minmax(0,1fr) auto;gap:4px;align-items:center} -.mx-vthrow .range input{grid-column:1/-1;width:100%;height:14px;accent-color:#6cc5d0;cursor:pointer} -.mx-vthrow .range output{color:#d8e9ef;font-size:10px;font-variant-numeric:tabular-nums} -.mx-vthrow .status{display:flex;justify-content:space-between;gap:10px;padding-top:8px; - border-top:1px solid #2d4855;color:#84a8b7;font-size:9px;letter-spacing:.045em} -.mx-vthrow .dot{display:inline-block;width:6px;height:6px;margin-right:5px;border-radius:50%; - background:#627f8f;box-shadow:0 0 0 1px #142c39} -.mx-vthrow .dot.active{background:#71d6b6;box-shadow:0 0 5px #71d6b677} -@media(max-width:480px){ - .mx-vthrow{top:6px;left:6px;width:calc(100vw - 12px);max-height:calc(100dvh - 12px)} - .mx-vthrow header{gap:5px;padding:0 6px 0 8px} - .mx-vthrow .brand{gap:4px}.mx-vthrow .brand-mark{font-size:8px} - .mx-vthrow .brand-name{font-size:10px}.mx-vthrow .channel{font-size:9px} - .mx-vthrow #vtPreset{width:88px;flex-basis:88px} - .mx-vthrow .body{padding:9px;gap:8px} - .mx-vthrow .lcd{padding:8px 10px} - .mx-vthrow #vtDisplayBpm{font-size:30px} -} -@media(max-width:350px){.mx-vthrow .channel{display:none}.mx-vthrow #vtPreset{flex-basis:78px;width:78px}} -@media(max-height:570px){ +.mx-vthrow button{font:inherit;cursor:pointer} +.mx-vthrow :is(button,select,input):focus-visible{outline:2px solid #b6e8e3;outline-offset:3px} +.mx-vthrow .vt-face-header{height:42px;flex:0 0 42px;display:flex;align-items:center;gap:8px; + min-width:0;padding:0 10px 0 16px;cursor:move;touch-action:none;user-select:none; + background:linear-gradient(#3d444e,#292f38);border-bottom:1px solid #141922; + box-shadow:inset 0 1px #ffffff29,inset 0 -1px #ffffff09} +.mx-vthrow .brand{display:flex;align-items:baseline;gap:7px;white-space:nowrap;flex:0 0 auto} +.mx-vthrow .brand-mark{font-size:9px;font-weight:660;color:#c885e7;letter-spacing:.12em} +.mx-vthrow .brand-name{font-size:12px;font-weight:580;color:#f0eef4;letter-spacing:.055em} +.mx-vthrow .channel{min-width:0;max-width:120px;flex:1;overflow:hidden;text-overflow:ellipsis; + white-space:nowrap;font-size:9px;color:#aeb1ba} +.mx-vthrow .vt-preset{display:flex;align-items:center;gap:4px;margin-left:auto;min-width:0} +.mx-vthrow .vt-preset select{width:112px;height:25px;min-width:0;max-width:112px;padding:0 7px; + border:1px solid #525c68;border-radius:4px;background:linear-gradient(#2a3039,#1f252e); + color:#dce1e9;font:500 10px Inter,'Segoe UI',sans-serif} +.mx-vthrow option{color:#e8eaf1;background:#272b34} +.mx-vthrow .vt-hardware{min-height:0;overflow:auto;overscroll-behavior:contain;display:grid; + padding:0;scrollbar-width:thin;scrollbar-color:#565563 #22272e} +.mx-vthrow .vt-console{padding:14px 17px 13px;border-bottom:1px solid #515660; + background:linear-gradient(135deg,#31363e,#262b34 65%,#2b2f38); + box-shadow:inset 0 1px #ffffff13} +.mx-vthrow .vt-instrument{display:grid;grid-template-columns:minmax(0,1fr) 212px minmax(0,1fr); + align-items:center;column-gap:15px;min-width:0} +.mx-vthrow .vt-encoder-bank{display:grid;grid-template-columns:repeat(3,minmax(0,1fr)); + justify-items:center;align-items:center;min-width:0;gap:3px} +.mx-vthrow .vt-encoder{display:flex;flex-direction:column;align-items:center;justify-content:center; + gap:5px;min-width:0;padding:6px 0 4px} +.mx-vthrow .vt-encoder-name{height:12px;line-height:12px;color:#a5b0bc;font-size:8px; + font-weight:530;letter-spacing:.055em;white-space:nowrap} +.mx-vthrow .vt-encoder-face{position:relative;display:block;flex:0 0 auto;width:68px;height:68px; + padding:0;border:0;border-radius:50%;touch-action:none;cursor:ns-resize; + background:transparent url("arson-vocal-hardware-encoder.svg") center/77% 77% no-repeat; + filter:drop-shadow(0 4px 5px #060a10a8)} +.mx-vthrow .vt-knob-meter{position:absolute;inset:0;width:100%;height:100%;overflow:visible; + fill:none;pointer-events:none} +.mx-vthrow .vt-meter-track,.mx-vthrow .vt-meter-fill{fill:none;stroke-width:3.3; + stroke-linecap:round;stroke-linejoin:round} +.mx-vthrow .vt-meter-track{stroke:#52616c;stroke-opacity:.8} +.mx-vthrow .vt-meter-fill{stroke:#79d4c7;stroke-width:3.8; + stroke-dasharray:100 100;stroke-dashoffset:var(--arc-offset,100); + filter:drop-shadow(0 0 1.3px #6ad8c788)} +.mx-vthrow .vt-encoder-needle{position:absolute;inset:0;transform:rotate(var(--turn,-130deg)); + pointer-events:none} +.mx-vthrow .vt-encoder-needle::after{content:"";position:absolute;left:calc(50% - 1.25px); + top:23%;height:12px;width:2.5px;border-radius:3px;background:#aee9e2; + box-shadow:0 0 3px #73cfce94} +.mx-vthrow .vt-encoder-value{font:500 11px/14px Inter,'Segoe UI',sans-serif; + color:#e0dce6;font-variant-numeric:tabular-nums;white-space:nowrap} +.mx-vthrow .vt-center{min-width:0;display:flex;align-items:center; + justify-content:center;flex-direction:column;gap:0} +.mx-vthrow .vt-throw-button{position:relative;display:block;width:212px;height:212px;flex:0 0 auto; + border:0;padding:0;border-radius:50%;overflow:visible;touch-action:manipulation;cursor:pointer; + background:transparent url("arson-vocal-throw-performance.svg") center/contain no-repeat; + filter:drop-shadow(0 8px 9px #090d15af);transform:translateZ(0); + transition:filter 150ms ease,transform 100ms ease} +.mx-vthrow .vt-throw-aura{position:absolute;inset:10%;border-radius:50%;pointer-events:none; + box-shadow:inset 0 0 0 1px #b267c821,0 0 0 1px #11141b; + transition:box-shadow 150ms ease} +.mx-vthrow .vt-throw-button:hover:not(:disabled){filter:brightness(1.19) drop-shadow(0 8px 10px #080c13ca)} +.mx-vthrow .vt-throw-button:hover:not(:disabled) .vt-throw-aura{box-shadow:0 0 22px #bc36df3b,inset 0 0 0 1px #c17fdd3a} +.mx-vthrow .vt-throw-button:active:not(:disabled){transform:scale(.958) translateY(2px); + filter:brightness(1.32) drop-shadow(0 1px 2px #000b)} +.mx-vthrow .vt-throw-button[data-tail=true]:not(:disabled) .vt-throw-aura{ + box-shadow:0 0 29px #bb29e73f,inset 0 0 0 1px #e7a7f783} +.mx-vthrow .vt-throw-button:disabled{opacity:.53;filter:grayscale(.72) brightness(.8)} +.mx-vthrow .vt-throw-engraving{margin-top:-3px;color:#a995b4; + font-size:9px;letter-spacing:.24em;font-weight:560;user-select:none} +.mx-vthrow .vt-performance{display:grid;grid-template-columns:90px minmax(0,1fr) 293px; + align-items:center;column-gap:18px;margin-top:8px;min-height:104px} +.mx-vthrow .vt-wet-module{padding:3px 0} +.mx-vthrow .vt-wet-module .vt-encoder-face{width:68px;height:68px} +.mx-vthrow .vt-trigger{min-width:0;display:flex;align-items:center;justify-content:center} +.mx-vthrow .vt-mode-buttons,.mx-vthrow .vt-division-buttons{display:flex;align-items:center; + gap:2px;padding:3px;border:1px solid #171c23;border-radius:7px; + background:linear-gradient(#131820,#242a32); + box-shadow:inset 0 2px 4px #060b11b8,0 1px #56606a3d} +.mx-vthrow :is(.vt-mode-buttons,.vt-division-buttons) button{flex:1;min-width:0; + min-height:29px;padding:3px 7px;border:1px solid transparent;border-radius:4px; + background:linear-gradient(#3b424b,#2d343d);box-shadow:inset 0 1px #ffffff15; + color:#a6b0bc;font-size:10px;font-weight:580;letter-spacing:.03em} +.mx-vthrow :is(.vt-mode-buttons,.vt-division-buttons) button[aria-pressed=true]{ + color:#f5e4ff;border-color:#784f8b;background:linear-gradient(#6a4c78,#3f344a); + box-shadow:inset 0 1px #efbaff2b,0 0 7px #b66bd327} +.mx-vthrow .vt-virtual-input,.mx-vthrow .vt-screen-reader{position:absolute!important; + width:1px!important;height:1px!important;padding:0!important;border:0!important; + opacity:0!important;overflow:hidden!important;pointer-events:none!important} +.mx-vthrow .vt-clock-tap{display:grid;grid-template-columns:minmax(0,1fr) 83px; + align-items:center;gap:9px;min-width:0} +.mx-vthrow .vt-tempo{min-width:0;display:flex;flex-direction:column;align-items:center;gap:3px} +.mx-vthrow .vt-clock-screen{position:relative;width:100%;height:79px;min-width:0;display:flex;flex-direction:column; + justify-content:center;align-items:stretch;gap:1px;padding:7px 11px 5px; + border:1px solid #42616a;border-radius:6px;color:#cbf8e9; + background:radial-gradient(ellipse at 50% 15%,#173b40b5,transparent 80%), + linear-gradient(155deg,#071c22,#092831 70%,#061a20); + box-shadow:inset 0 2px 11px #000b,inset 0 0 0 1px #092a32,0 1px #53667233} +.mx-vthrow .vt-lcd-top{display:flex;align-items:center;justify-content:space-between; + font-size:9px;letter-spacing:.15em;color:#77aead} +.mx-vthrow #vtClockLabel{color:#a9dec5;font-size:9px;font-weight:550;letter-spacing:.1em} +.mx-vthrow .vt-lcd-digits{display:flex;align-items:baseline;gap:8px} +.mx-vthrow #vtDisplayBpm{padding:0;margin:0;border:0;background:none;appearance:none; + font:500 44px/1.04 'Segoe UI',Inter,sans-serif; + color:#d8fff2;letter-spacing:-.05em;font-variant-numeric:tabular-nums; + text-shadow:0 0 15px #61b7a533;cursor:text;text-align:left} +.mx-vthrow #vtDisplayBpm:hover{color:#e8fff7} +.mx-vthrow .vt-clock-screen[data-editing=true] #vtDisplayBpm{opacity:0;pointer-events:none} +.mx-vthrow .vt-lcd-digits>span{font-size:10px;color:#7fbeb2;letter-spacing:.07em} +.mx-vthrow .vt-manual-bpm{display:none;position:absolute;left:11px;right:10px; + top:25px;height:49px;align-items:center;z-index:1} +.mx-vthrow .vt-clock-screen[data-editing=true] .vt-manual-bpm{display:flex} +.mx-vthrow .vt-manual-bpm input{width:100%;max-width:148px;height:49px;margin:0; + padding:0;border:0;border-bottom:1px solid #75d5c58f;border-radius:0; + outline:0;background:#0b252d;color:#d8fff2; + font:500 44px/1.04 'Segoe UI',sans-serif;text-align:left; + letter-spacing:-.05em;font-variant-numeric:tabular-nums; + appearance:textfield} +.mx-vthrow .vt-manual-bpm input::-webkit-inner-spin-button, +.mx-vthrow .vt-manual-bpm input::-webkit-outer-spin-button{appearance:none;margin:0} +.mx-vthrow .vt-tap-button{height:81px;display:flex;flex-direction:column; + align-items:center;justify-content:center;gap:1px;color:#c8d0d9; + background:linear-gradient(#414852,#262c35);border:1px solid #4c5661;border-radius:12px; + box-shadow:inset 0 1px #ffffff21,0 3px 6px #0008} +.mx-vthrow .vt-tap-button span{font-size:15px;font-weight:640;letter-spacing:.12em} +.mx-vthrow .vt-tap-button small{font-size:9px;letter-spacing:.12em;color:#a5b0bc} +.mx-vthrow .vt-tap-button:active{background:linear-gradient(#242931,#353b45); + box-shadow:inset 0 2px 5px #000a} +.mx-vthrow .vt-transport{min-width:0;display:grid; + grid-template-columns:minmax(0,1fr) minmax(0,1fr);gap:24px; + padding:12px 18px 13px;background:linear-gradient(#232a33,#20252d); + border-top:1px solid #0f141b;border-bottom:1px solid #4b525c} +.mx-vthrow .vt-pulse,.mx-vthrow .vt-music-source{min-width:0; + display:flex;flex-direction:column;align-items:stretch;gap:6px} +.mx-vthrow .vt-small-label{font-size:9px;font-weight:550;letter-spacing:.11em; + color:#a7acb6;white-space:nowrap} +.mx-vthrow .vt-division-buttons{height:38px} +.mx-vthrow .vt-division-buttons button{height:30px;padding:3px 4px} +.mx-vthrow .vt-repeat-leds{display:flex;align-items:center;gap:5px; + white-space:nowrap;height:14px} +.mx-vthrow .vt-repeat-leds i{display:block;width:16px;height:3px; + border-radius:3px;background:#3d4550} +.mx-vthrow .vt-repeat-leds i[data-on=true]{background:#7bd4c7;box-shadow:0 0 4px #7bd4c755} +.mx-vthrow .vt-repeat-leds[data-playing=true] i[data-on=true]{background:#ade6d4} +.mx-vthrow .vt-music-source select{height:38px;width:100%;min-width:0;padding:0 9px; + border:1px solid #46515e;border-radius:5px;background:linear-gradient(#333a45,#252c36); + color:#d8e0e8;font:500 10px Inter,'Segoe UI',sans-serif} +.mx-vthrow .music-status{height:14px;overflow:hidden;text-overflow:ellipsis; + white-space:nowrap;font-size:9px;color:#9abfb9} +.mx-vthrow .vt-status-rail{height:29px;min-width:0;display:flex;align-items:center; + justify-content:space-between;gap:14px;padding:0 17px; + border-top:1px solid #090d13;background:linear-gradient(#272d36,#232831); + font-size:9px;letter-spacing:.035em;color:#929eaa} +.mx-vthrow .vt-device{flex:0 0 auto;white-space:nowrap} +.mx-vthrow .dot{display:inline-block;width:6px;height:6px;margin-right:6px; + border-radius:50%;background:#6f7781;box-shadow:0 0 0 1px #10141a} +.mx-vthrow .dot.active{background:#79cbb8;box-shadow:0 0 5px #79cbb855} +.mx-vthrow .vt-hint{min-width:0;flex:1;text-align:center;overflow:hidden; + text-overflow:ellipsis;white-space:nowrap} +.mx-vthrow #vtCount{flex:0 0 auto;white-space:nowrap} +.mx-vthrow[data-fx-state=off] :is(.vt-encoder-face,.vt-throw-button), +.mx-vthrow[data-fx-state=rack-off] :is(.vt-encoder-face,.vt-throw-button){ + opacity:.55;filter:grayscale(.55) brightness(.77)} +@media(max-width:770px){ + .mx-vthrow{top:7px;left:7px} + .mx-vthrow .vt-console{padding:10px 10px 12px} + .mx-vthrow .vt-instrument{grid-template-columns:minmax(0,1fr) 192px minmax(0,1fr);gap:8px} + .mx-vthrow .vt-throw-button{width:192px;height:192px} + .mx-vthrow .vt-encoder-face{width:54px;height:54px} + .mx-vthrow .vt-encoder-name{font-size:7.5px} + .mx-vthrow .vt-encoder-needle::after{height:9px} + .mx-vthrow .vt-performance{grid-template-columns:78px minmax(0,1fr) 285px;column-gap:8px} + .mx-vthrow .vt-wet-module .vt-encoder-face{width:54px;height:54px} + .mx-vthrow .vt-transport{gap:14px;padding:10px} +} +@media(max-width:600px){ + .mx-vthrow{width:calc(100vw - 10px);max-height:calc(100dvh - 10px);left:5px;top:5px} + .mx-vthrow .vt-face-header{height:39px;flex-basis:39px;gap:5px;padding:0 7px} + .mx-vthrow .brand{gap:5px}.mx-vthrow .brand-mark{font-size:8px} + .mx-vthrow .brand-name{font-size:10px} + .mx-vthrow .channel{max-width:42px;font-size:8px} + .mx-vthrow .vt-preset select{width:82px;max-width:82px;font-size:9px} + .mx-vthrow .vt-instrument{display:flex;flex-direction:column;gap:0} + .mx-vthrow .vt-center{order:0;margin-bottom:8px} + .mx-vthrow #vtEncodersLeft{order:1} + .mx-vthrow #vtEncodersRight{order:2} + .mx-vthrow .vt-throw-button{width:166px;height:166px} + .mx-vthrow .vt-throw-engraving{font-size:9px;margin-top:-4px} + .mx-vthrow .vt-encoder-bank{width:100%;grid-template-columns:repeat(3,minmax(0,1fr));gap:0} + .mx-vthrow .vt-encoder{gap:3px;padding:3px 0 2px} + .mx-vthrow .vt-encoder-face{width:59px;height:59px} + .mx-vthrow .vt-encoder-name{font-size:8px} + .mx-vthrow .vt-encoder-value{font-size:10px} + .mx-vthrow .vt-performance{grid-template-columns:76px minmax(0,1fr); + column-gap:12px;row-gap:8px;min-height:0;margin-top:8px} + .mx-vthrow .vt-wet-module .vt-encoder-face{width:59px;height:59px} + .mx-vthrow .vt-clock-tap{grid-column:1/-1;grid-template-columns:minmax(0,1fr) 85px; + align-items:center;gap:10px} + .mx-vthrow .vt-clock-screen{height:83px} + .mx-vthrow #vtDisplayBpm{font-size:47px} + .mx-vthrow .vt-tap-button{height:84px} + .mx-vthrow .vt-mode-buttons{width:max-content;max-width:100%} + .mx-vthrow .vt-mode-buttons button{font-size:9px;min-height:31px;padding:3px 7px} + .mx-vthrow .vt-transport{grid-template-columns:1fr;gap:9px;padding:10px} + .mx-vthrow .vt-division-buttons{height:35px} + .mx-vthrow .vt-division-buttons button{font-size:9px;height:27px} + .mx-vthrow .vt-music-source select{height:31px} + .mx-vthrow .vt-status-rail{gap:7px;padding:0 9px} +} +@media(max-width:350px){ + .mx-vthrow .channel{display:none} + .mx-vthrow .brand-name{font-size:9px} + .mx-vthrow .vt-preset select{width:72px} + .mx-vthrow .vt-mode-buttons button{padding:3px 5px} +} +@media(max-height:590px) and (min-width:601px){ .mx-vthrow{top:4px;max-height:calc(100dvh - 8px)} - .mx-vthrow .body{padding-top:6px;gap:6px} - .mx-vthrow .lcd{padding:6px 9px} - .mx-vthrow #vtDisplayBpm{font-size:27px} + .mx-vthrow .vt-console{padding-top:6px;padding-bottom:7px} + .mx-vthrow .vt-throw-button{height:172px;width:172px} + .mx-vthrow .vt-instrument{grid-template-columns:minmax(0,1fr) 176px minmax(0,1fr)} +} +@media(prefers-reduced-motion:reduce){ + .mx-vthrow .vt-throw-button,.mx-vthrow .vt-throw-aura{transition:none} } diff --git a/site/preview-v2/assets/mixer-native-vocal-throw.js b/site/preview-v2/assets/mixer-native-vocal-throw.js index 93ec25c91..e7b1cd385 100644 --- a/site/preview-v2/assets/mixer-native-vocal-throw.js +++ b/site/preview-v2/assets/mixer-native-vocal-throw.js @@ -13,9 +13,6 @@ const presets={ }; const ranges={bpm:[60,200],repeats:[1,6],captureMs:[80,1500],silenceMs:[80,900], thresholdDb:[-65,-15],wet:[0,1],decay:[.15,.9],ducking:[0,1]}; -const fields={captureMs:["Capture","ms",5],silenceMs:["End pause","ms",10], - thresholdDb:["Voice gate","dB",1],wet:["Echo mix","%",.01], - decay:["Decay","%",.01],ducking:["Vocal duck","%",.01]}; const valid=s=>s&&[0,1,2].includes(s.mode)&&[0,1,2,3].includes(s.division)&& Object.entries(ranges).every(([k,[min,max]])=> Number.isFinite(s[k])&&s[k]>=min&&s[k]<=max); @@ -29,29 +26,46 @@ const panel=document.createElement("section"); panel.className="mx-vthrow";panel.id="mxNativeVocalThrow";panel.hidden=true; panel.setAttribute("role","dialog");panel.setAttribute("aria-modal","false"); panel.setAttribute("aria-label","ArSon Vocal Throw"); +// One universal 260-degree rounded level arc for EVERY hardware encoder. +// The face itself stays stationary; only the pointer and stroke advance. +const rotaryArc=''+ + ''+ + ''+ + ''; panel.innerHTML=[ - 'ARSONVOCAL THROW', - 'ConcertFast EchoBalladLast WordCustom', + 'ARSONVOCAL THROW', + 'ConcertFast EchoBalladLast WordCustom', '⏻×', - 'ARSON / PHRASE ENGINEMANUAL CLOCK120BPM1/4 · HYBRIDTRIGGER MODEManualAutoHybrid', - 'TEMPO · BPM', - 'BEAT1/41/81/8 D1/2', - 'REPEATS', - 'MUSIC TEMPO SOURCEManual / TAPManual BPM fallback', - 'THROWTAP BPM', - 'Native DSP · waiting for accepted channel', - 'Phrase & echo shaping', - 'FX READY0 throws' + '', + '', + 'THROW', + '', + 'MIX'+rotaryArc+'42%', + 'MANAUTOHYBRIDManualAutoHybrid', + 'TEMPOMAN120BPMTAPBPM', + '', + 'RHYTHM1/41/81/8 D1/21/41/81/8 D1/21/4 · HYBRID', + 'MUSICManual / TAPTAP', + '' ].join(""); document.body.append(panel); const $=id=>panel.querySelector("#"+id); -for(const [key,[title,unit,step]] of Object.entries(fields)){ - const label=document.createElement("label");label.className="range";label.dataset.key=key; - label.innerHTML=''+title+''; - const input=label.querySelector("input"),bounds=ranges[key]; - input.min=String(bounds[0]);input.max=String(bounds[1]);input.step=String(step); - input.setAttribute("aria-label",title);label.querySelector("output").dataset.unit=unit; - $("vtRanges").append(label); +const encoderMeta={ + captureMs:["CAPTURE","ms",5,"vtEncodersLeft"], + silenceMs:["END","ms",10,"vtEncodersLeft"], + thresholdDb:["GATE","dB",1,"vtEncodersLeft"], + decay:["DECAY","%",.01,"vtEncodersRight"], + ducking:["DUCK","%",.01,"vtEncodersRight"], + repeats:["REPEATS","x",1,"vtEncodersRight"] +}; +for(const [key,[title,unit,,bank]] of Object.entries(encoderMeta)){ + const node=document.createElement("div"); + node.className="vt-encoder";node.dataset.key=key; + node.innerHTML=''+title+''+ + ''+rotaryArc+''+ + ''; + node.querySelector("output").dataset.unit=unit; + $(bank).append(node); } let current=null,accepted=defaults(),draft=defaults(),pending=null, readId="",readSent=0,seq=1,taps=[],windowDrag=null; @@ -81,32 +95,25 @@ function refreshMusicChannels(){ } function renderMusicStatus(tempo){ if(tempo)musicReadback=tempo; - const label=$("vtMusicStatus"),clock=$("vtClockLabel"); - if(tempoPending){label.textContent="Validating music channel…";clock.textContent="SOURCE CHECK";return;} - if(musicSource==="0"){ - label.textContent="Manual BPM / TAP";clock.textContent="MANUAL CLOCK"; - $("vtDisplayBpm").textContent=String(Math.round(accepted.bpm));return; - } - if(!musicReadback?.musicSourceActive){ - label.textContent="Source stale · manual fallback";clock.textContent="MANUAL CLOCK"; - $("vtDisplayBpm").textContent=String(Math.round(accepted.bpm));return; - } - if(!musicReadback.musicLocked){ - label.textContent="Listening for beat · manual fallback";clock.textContent="LISTENING"; - $("vtDisplayBpm").textContent=String(Math.round(accepted.bpm));return; - } + const label=$("vtMusicStatus"),clock=$("vtClockLabel"),number=$("vtDisplayBpm"); + const fallback=()=>{number.textContent=String(Math.round(accepted.bpm));clock.textContent="MAN";}; + if(tempoPending){label.textContent="CONNECT";label.title="Validating music channel";clock.textContent="CHECK";return;} + if(musicSource==="0"){label.textContent="TAP";label.title="Manual BPM / TAP";fallback();return;} + if(!musicReadback?.musicSourceActive){label.textContent="NO SIGNAL";label.title="Music source unavailable · manual BPM fallback";fallback();return;} + if(!musicReadback.musicLocked){label.textContent="LISTEN";label.title="Listening for beat · manual BPM fallback";fallback();return;} const confidence=Math.round(Math.max(0,Math.min(1,Number(musicReadback.musicConfidence)||0))*100); const beatGrid=musicReadback.musicGridAvailable===true; - label.textContent="AUTO "+Math.round(Number(musicReadback.musicBpm))+ - " BPM · "+(beatGrid?"BEAT GRID":"BPM only")+ - " · "+confidence+"%"; - clock.textContent=beatGrid?"GRID LOCK":"AUTO BPM"; - $("vtDisplayBpm").textContent=String(Math.round(Number(musicReadback.musicBpm))); + const bpm=Math.round(Number(musicReadback.musicBpm)); + label.textContent=beatGrid?bpm+" · GRID":bpm+" · BPM"; + label.title="Auto tempo "+bpm+" BPM · "+confidence+"% confidence · "+(beatGrid?"beat grid":"BPM only"); + clock.textContent=beatGrid?"LOCK":"AUTO"; + number.textContent=String(bpm); } function syncPower(){ const state=snapshot(),id=current&&window.__ARMIX_NATIVE_M2__?.nativeIdFor?.(current.track); const lane=state?.graph?.channels?.find(ch=>ch.id===id),fx=lane?.inserts?.[current?.slot]; const value=!context()?"unknown":lane.fxRackBypassed?"rack-off":fx.bypassed?"off":"on"; + panel.dataset.fxState=value; const btn=$("vtPower");btn.dataset.fxState=value; btn.disabled=value==="unknown"||value==="rack-off"; btn.title=value==="on"?"Active · click to bypass":value==="off"?"Bypassed · click to enable": @@ -114,21 +121,47 @@ function syncPower(){ btn.setAttribute("aria-pressed",String(value==="on")); btn.setAttribute("aria-label",btn.title); $("vtThrow").disabled=value!=="on"||!!pending; + $("vtStatus").textContent=value==="on"? + ($("vtThrow").dataset.tail==="true"?"TAIL":"LIVE"): + value==="off"?"BYPASS":value==="rack-off"?"RACK OFF":"OFFLINE"; } function paint(){ - $("vtMode").value=String(draft.mode);$("vtBpm").value=String(draft.bpm); + $("vtMode").value=String(draft.mode); + if(panel.querySelector(".vt-clock-screen").dataset.editing!=="true") + $("vtBpm").value=String(draft.bpm); $("vtDivision").value=String(draft.division);$("vtRepeats").value=String(draft.repeats); - for(const [key,[,unit]] of Object.entries(fields)){ - const label=$("vtRanges").querySelector('[data-key="'+key+'"]'); - label.querySelector("input").value=String(draft[key]); - label.querySelector("output").textContent= + for(const [key,[,unit]] of Object.entries(encoderMeta)){ + const node=panel.querySelector('.vt-encoder[data-key="'+key+'"]'); + const min=ranges[key][0],max=ranges[key][1]; + const pct=(draft[key]-min)/(max-min); + const turn=-130+260*pct; + node.style.setProperty("--turn",turn.toFixed(2)+"deg"); + // pathLength=100 guarantees a linearly advancing, rounded 260-degree arc. + // Never rotate the knob chassis with the pointer. + node.style.setProperty("--arc-offset",(100-pct*100).toFixed(3)); + node.querySelector(".vt-encoder-value").textContent= (unit==="%"?Math.round(draft[key]*100):Math.round(draft[key]))+unit; + const dial=node.querySelector(".vt-encoder-face"); + dial.setAttribute("aria-valuemin",String(min)); + dial.setAttribute("aria-valuemax",String(max)); + dial.setAttribute("aria-valuenow",String(draft[key])); + dial.setAttribute("aria-valuetext",node.querySelector(".vt-encoder-value").textContent); } + const wetPct=Math.round(draft.wet*100); + $("vtWetValue").textContent=wetPct+"%"; + $("vtWetDial").style.setProperty("--turn",(-130+260*draft.wet).toFixed(2)+"deg"); + $("vtWetDial").style.setProperty("--arc-offset",(100-draft.wet*100).toFixed(3)); + $("vtWetDial").setAttribute("aria-valuenow",String(wetPct)); + $("vtWetDial").setAttribute("aria-valuetext",wetPct+" percent"); + for(const b of panel.querySelectorAll(".vt-mode-buttons button")) + b.setAttribute("aria-pressed",String(Number(b.dataset.mode)===draft.mode)); + for(const b of panel.querySelectorAll(".vt-division-buttons button")) + b.setAttribute("aria-pressed",String(Number(b.dataset.division)===draft.division)); $("vtPreset").value=Object.entries(presets).find(([,v])=>same(v,draft))?.[0]||"Custom"; const rhythmic=["1/4","1/8","DOTTED 1/8","1/2"][accepted.division]; const modes=["MANUAL","AUTO","HYBRID"]; $("vtRhythm").textContent=rhythmic+" · "+modes[accepted.mode]; - for(const [index,led] of [...$("vtBeatRail").children].entries()) + for(const [index,led] of [...$("vtBeatRail").querySelectorAll("i")].entries()) led.dataset.on=String(index{ + if(!current||pending)return; + bpmScreen.dataset.editing="true"; + $("vtBpm").value=String(draft.bpm); + $("vtBpm").focus();$("vtBpm").select(); +}); +$("vtBpm").addEventListener("keydown",e=>{ + if(e.key==="Escape"){ + e.preventDefault();e.stopPropagation(); + $("vtBpm").value=String(accepted.bpm); + $("vtBpm").blur(); + }else if(e.key==="Enter"){ + e.preventDefault();$("vtBpm").blur(); + } +}); +$("vtBpm").addEventListener("blur",()=>{bpmScreen.dataset.editing="false";}); for(const [key,id] of [["mode","vtMode"],["bpm","vtBpm"], ["division","vtDivision"],["repeats","vtRepeats"]]){ $(id).addEventListener("change",()=>{ draft={...draft,[key]:Number($(id).value)};paint();send("nativeThrowSet"); }); } -for(const key of Object.keys(fields)){ - const input=$("vtRanges").querySelector('[data-key="'+key+'"] input'); - input.addEventListener("input",()=>{ - const value=Number(input.value),bounds=ranges[key]; - draft={...draft,[key]:clamp(value,bounds[0],bounds[1])};paint(); +// Physical rotary control: vertical pointer drag, mouse wheel and keyboard. +// Update visual locally during movement; issue exactly ONE accepted native +// settings intent at drag release. No DOM/audio DSP loops are introduced. +function bindRotary(face,key,step){ + const [min,max]=ranges[key]; + const quantize=v=>clamp(Math.round(v/step)*step,min,max); + let gesture=null; + const update=v=>{if(pending)return;draft={...draft,[key]:quantize(v)};paint();}; + face.addEventListener("pointerdown",e=>{ + if(e.button!==0||pending)return; + gesture={id:e.pointerId,y:e.clientY,initial:draft[key],changed:false}; + face.setPointerCapture(e.pointerId);e.preventDefault(); + }); + face.addEventListener("pointermove",e=>{ + if(!gesture||gesture.id!==e.pointerId)return; + const next=quantize(gesture.initial+(gesture.y-e.clientY)*(max-min)/168); + if(next!==draft[key]){gesture.changed=true;update(next);} + e.preventDefault(); + }); + const finish=e=>{ + if(!gesture||e.pointerId!==gesture.id)return; + const changed=gesture.changed;gesture=null; + if(face.hasPointerCapture?.(e.pointerId))face.releasePointerCapture(e.pointerId); + if(changed)send("nativeThrowSet"); + }; + face.addEventListener("pointerup",finish); + face.addEventListener("pointercancel",()=>{gesture=null;paint();}); + face.addEventListener("wheel",e=>{ + if(pending)return; + e.preventDefault();update(draft[key]+(e.deltaY<0?step:-step)); + send("nativeThrowSet"); + },{passive:false}); + face.addEventListener("keydown",e=>{ + const delta={ArrowUp:1,ArrowRight:1,ArrowDown:-1,ArrowLeft:-1,PageUp:5,PageDown:-5}[e.key]; + if(delta===undefined&&e.key!=="Home"&&e.key!=="End")return; + e.preventDefault(); + update(e.key==="Home"?min:e.key==="End"?max:draft[key]+delta*step); + send("nativeThrowSet"); + }); + face.addEventListener("dblclick",()=>{ + if(pending)return; + update(defaults()[key]);send("nativeThrowSet"); + }); +} +for(const [key,[,,step]] of Object.entries(encoderMeta)) + bindRotary(panel.querySelector('.vt-encoder[data-key="'+key+'"] .vt-encoder-face'),key,step); +bindRotary($("vtWetDial"),"wet",.01); +for(const button of panel.querySelectorAll(".vt-mode-buttons button")){ + button.addEventListener("click",()=>{ + $("vtMode").value=button.dataset.mode; + $("vtMode").dispatchEvent(new Event("change",{bubbles:true})); + }); +} +for(const button of panel.querySelectorAll(".vt-division-buttons button")){ + button.addEventListener("click",()=>{ + $("vtDivision").value=button.dataset.division; + $("vtDivision").dispatchEvent(new Event("change",{bubbles:true})); }); - input.addEventListener("change",()=>send("nativeThrowSet")); } $("vtMusicSource").addEventListener("change",()=>{ const ctx=context(),source=String($("vtMusicSource").value); @@ -222,7 +325,7 @@ window.ArSonMixNativeVocalThrow=Object.freeze({ const insert=state?.graph?.channels?.find(ch=>ch.id===id)?.inserts?.[slot]; if(native()&&state?.admitted&&insert?.catalogId===ID&&insert.id){ current.instanceId=insert.id;draft=defaults();accepted=defaults(); - hint("Reading accepted DSP settings"); + hint(""); }else if(!native()){draft=defaults();accepted=defaults(); hint("Browser preview only · no PCM");} else hint("Native FX instance unavailable"); @@ -235,7 +338,7 @@ backend()?.addEventListener?.("arMixBuiltinThrowTempoAck",reply=>{ if(!tempoPending||reply?.requestId!==tempoPending.requestId)return; if(reply.status==="APPLIED"){ musicSource=tempoPending.source; - hint("Music tempo source accepted by native PCM graph"); + hint(""); }else hint("Tempo source rejected · "+(reply.errorCode||"STALE")); tempoPending=null;refreshMusicChannels();renderMusicStatus(); requestSnapshot(true); @@ -249,7 +352,7 @@ backend()?.addEventListener?.("arMixBuiltinThrowAck",reply=>{ if(!pending||reply?.requestId!==pending.requestId)return; if(reply.status!=="APPLIED"){hint("DSP rejected · "+(reply.errorCode||"UNKNOWN")); pending=null;requestSnapshot(true);syncPower();return;} - if(pending.command==="nativeThrowTrigger"){hint("THROW executed by audio callback"); + if(pending.command==="nativeThrowTrigger"){hint(""); pending=null;requestSnapshot(true);syncPower();} else{pending.ack=true;requestSnapshot(true);} }); @@ -265,14 +368,16 @@ backend()?.addEventListener?.("arMixBuiltinThrowSnapshot",reply=>{ musicSource=String(reply.musicSourceChannelId||"0"); refreshMusicChannels();renderMusicStatus(reply); } - $("vtCount").textContent=String(reply.throwCount||0)+" throws"; + $("vtCount").textContent=String(reply.throwCount||0); + $("vtCount").setAttribute("aria-label",String(reply.throwCount||0)+" completed throws"); $("vtDot").classList.toggle("active",reply.tailActive===true); $("vtBeatRail").dataset.playing=String(reply.tailActive===true); - $("vtStatus").textContent=reply.tailActive?"ECHO TAIL":"NATIVE DSP"; + $("vtThrow").dataset.tail=String(reply.tailActive===true); + $("vtStatus").textContent=reply.tailActive?"TAIL":"LIVE"; if(pending){ if(!pending.ack||reply.appliedRequestId!==pending.requestId)return; accepted={...reply.settings};draft={...accepted};pending=null; - hint("Native DSP settings accepted"); + hint(""); }else{accepted={...reply.settings};draft={...accepted};} paint(); }); diff --git a/tests/approved_native_vocal_throw_smoke.py b/tests/approved_native_vocal_throw_smoke.py index 4d760efc9..4d35568f4 100644 --- a/tests/approved_native_vocal_throw_smoke.py +++ b/tests/approved_native_vocal_throw_smoke.py @@ -42,6 +42,10 @@ def main(): spec=importlib.util.spec_from_file_location( "bundle",ROOT/"scripts/build_approved_native_gui.py") bundle=importlib.util.module_from_spec(spec);spec.loader.exec_module(bundle) + source_svg=(ROOT/"site/preview-v2/assets/arson-vocal-throw-performance.svg").read_text() + assert "data:image/webp;base64," in source_svg, "original user Illustrator icon must be embedded" + assert 'clip-path="url(#aiLens)"' in source_svg + assert 'M128 29 L120 43' not in source_svg, "no 4-way navigation markers on THROW" with tempfile.TemporaryDirectory(prefix="armix-throw-") as directory,sync_playwright() as pw: out=Path(directory);bundle.stage(out) browser=pw.chromium.launch(headless=True) @@ -113,20 +117,104 @@ def main(): assert last(page,"nativeThrowSnapshot")["requestId"]==initial["requestId"],\ "snapshot polling overwrote outstanding request too early" reply_snapshot(page,state,DEFAULTS) - assert editor.locator("#vtStatus").inner_text()=="NATIVE DSP" - assert editor.locator("#vtCount").inner_text()=="0 throws" + assert editor.locator("#vtStatus").inner_text()=="LIVE" + assert editor.locator("#vtCount").inner_text()=="0" box=editor.bounding_box() - assert box and box["width"]<=438 and box["width"]<=width and \ + assert box and box["width"]<=778 and box["width"]<=width and \ box["x"]>=0 and box["x"]+box["width"]<=width+1,(width,box) assert editor.evaluate("(el)=>el.scrollWidth<=el.clientWidth+1"),\ "premium FX editor overflows horizontal viewport" assert editor.locator("#vtDisplayBpm").inner_text()=="120" - assert editor.locator("#vtClockLabel").inner_text()=="MANUAL CLOCK" + assert editor.locator("#vtClockLabel").inner_text()=="MAN" + # BPM is one integrated LCD number, not a detached duplicate. + # Click the LCD to enter editing; Escape restores the accepted + # native setting without issuing a new DSP command. + assert editor.locator("#vtBpm").is_hidden() + editor.locator("#vtDisplayBpm").click() + assert editor.locator("#vtBpm").is_visible() + assert editor.locator("#vtBpm").input_value()=="120" + editor.locator("#vtBpm").fill("133") + editor.locator("#vtBpm").press("Escape") + assert editor.locator("#vtBpm").is_hidden() + assert editor.locator("#vtDisplayBpm").inner_text()=="120" assert editor.locator("#vtBeatRail i[data-on='true']").count()==3 + assert editor.locator(".vt-encoder-bank .vt-encoder-face").count()==6 + assert editor.locator("#vtWetDial[role='slider']").count()==1 + assert editor.locator(".vt-throw-button").count()==1 + trigger=editor.locator("#vtThrow") + assert trigger.get_attribute("aria-label")=="Throw captured vocal phrase" + assert trigger.inner_text().strip()=="","Singer cue has no noisy visible words" + tb=trigger.bounding_box() + assert tb and tb["width"]>=160 and tb["height"]>=160 + assert editor.locator(".vt-throw-engraving").inner_text()=="THROW" + assert editor.locator("#vtTap").is_visible() + assert editor.locator("#vtMusicStatus").inner_text()=="TAP" + assert "FIRE PHRASE" not in editor.inner_text() + assert "SMART PHRASE / LIVE ENGINE" not in editor.inner_text() + assert "ZERO DRY LATENCY" not in editor.inner_text() + assert editor.locator(".vt-mode-buttons button").count()==3 + assert editor.locator(".vt-division-buttons button").count()==4 + # No browser form hiding of basic parameters: real accessible + # hardware rotary controls are displayed at desktop AND mobile. + assert editor.locator("#vtWetDial").is_visible() + assert editor.locator('.vt-encoder[data-key="captureMs"] button').is_visible() + # Every control, including MIX, has the exact SAME stationary + # knob body, pointer and rounded level arc geometry. + assert editor.locator(".vt-encoder-face").count()==7 + assert editor.locator(".vt-meter-fill").count()==7 + assert editor.locator(".vt-knob-meter").count()==7 + for dial in editor.locator(".vt-encoder-face").all(): + bg=dial.evaluate("(el)=>getComputedStyle(el).backgroundImage") + assert "arson-vocal-hardware-encoder.svg" in bg,bg + assert dial.locator(".vt-meter-fill").get_attribute("pathLength")=="100" + # Inspect the actual rendered SVG control backgrounds. WebView + # file:// disables fetch() for SVG files, not CSS backgrounds. + for selector,name in [("#vtWetDial","encoder"), + ('.vt-encoder-face',"encoder"), + ("#vtThrow","performance")]: + bg=editor.locator(selector).first.evaluate( + "(el)=>getComputedStyle(el).backgroundImage") + assert ("arson-vocal-throw-performance.svg" if name=="performance" + else "arson-vocal-hardware-"+name+".svg") in bg,(selector,bg) + # Bounded physical layout QA, not just a screenshot. The large + # singer switch must be centered, the two encoder banks in + # alignment, and tempo LCD and TAP must be physically adjacent. + throw=editor.locator("#vtThrow").bounding_box() + left=editor.locator("#vtEncodersLeft").bounding_box() + right=editor.locator("#vtEncodersRight").bounding_box() + lcd=editor.locator(".vt-clock-screen").bounding_box() + tap=editor.locator("#vtTap").bounding_box() + assert all([throw,left,right,lcd,tap]) + assert abs((throw["x"]+throw["width"]/2)-(box["x"]+box["width"]/2))<4, \ + ("THROW is off center",width,throw,box) + if width>600: + assert abs(left["y"]-right["y"])<3, ("uneven encoder rows",left,right) + assert left["x"]+left["width"]<=throw["x"]+1 and \ + throw["x"]+throw["width"]<=right["x"]+1, \ + ("encoders invade singer button",left,throw,right) + else: + assert throw["y"]+throw["height"]=145 and lcd["height"]>=70 + rail=editor.locator(".vt-status-rail").bounding_box() + assert rail and rail["y"]+rail["height"]<=box["y"]+box["height"]+2, \ + ("footer clipped beneath mobile controls",width,rail,box) + # No control may draw past the horizontal plugin bounds. + for control in ["#vtThrow","#vtTap","#vtWetDial", + "#vtClockLabel","#vtDisplayBpm"]: + rect=editor.locator(control).bounding_box() + assert rect and rect["x"]>=box["x"]-1 and \ + rect["x"]+rect["width"]<=box["x"]+box["width"]+1,(control,rect,box) page.screenshot(path="arsonmix-vocal-throw-"+str(width)+".png") editor.screenshot(path="arsonmix-vocal-throw-editor-"+str(width)+".png") if width==1366: - editor.locator("#vtMode").select_option("0") + editor.locator('.vt-mode-buttons button[data-mode="0"]').click() edit=last(page,"nativeThrowSet") assert edit["settings"]["mode"]==0 and edit["instanceId"]==INSTANCE assert edit["channelId"]==SOURCE @@ -134,32 +222,60 @@ def main(): emit(page,"arMixBuiltinThrowAck",{"requestId":edit["requestId"],"status":"APPLIED"}) reply_snapshot(page,state,{**DEFAULTS,"mode":0},applied=edit["requestId"]) assert editor.locator("#vtMode").input_value()=="0" + assert editor.locator('.vt-mode-buttons button[data-mode="0"]').get_attribute("aria-pressed")=="true" + # Rotary wheel edits actually send settings through the native + # request/ACK/readback contract, not a CSS-only animation. + dial=editor.locator("#vtWetDial") + before=dial.evaluate("""el=>({ + offset:parseFloat(getComputedStyle(el.querySelector('.vt-meter-fill')).strokeDashoffset), + transform:getComputedStyle(el.querySelector('.vt-encoder-needle')).transform, + bg:getComputedStyle(el).backgroundImage + })""") + dial.hover() + page.mouse.wheel(0,-120) + after=dial.evaluate("""el=>({ + offset:parseFloat(getComputedStyle(el.querySelector('.vt-meter-fill')).strokeDashoffset), + transform:getComputedStyle(el.querySelector('.vt-encoder-needle')).transform, + bg:getComputedStyle(el).backgroundImage + })""") + assert float(after["offset"]).42 and rotary["settings"]["wet"]<=.44 + emit(page,"arMixBuiltinThrowQueue",{"requestId":rotary["requestId"],"status":"QUEUED"}) + emit(page,"arMixBuiltinThrowAck",{"requestId":rotary["requestId"],"status":"APPLIED"}) + updated={**DEFAULTS,"mode":0,"wet":rotary["settings"]["wet"]} + reply_snapshot(page,state,updated,applied=rotary["requestId"]) + assert "%" in editor.locator("#vtWetValue").inner_text() editor.locator("#vtThrow").click() + assert editor.locator("#vtThrow").is_disabled(), "no repeated stage cue until native ACK" cue=last(page,"nativeThrowTrigger") assert cue["instanceId"]==INSTANCE and cue["channelId"]==SOURCE assert cue["slot"]==0 emit(page,"arMixBuiltinThrowQueue",{"requestId":cue["requestId"],"status":"QUEUED"}) emit(page,"arMixBuiltinThrowAck",{"requestId":cue["requestId"],"status":"APPLIED"}) - reply_snapshot(page,state,{**DEFAULTS,"mode":0},count=1,tail=True) - assert editor.locator("#vtCount").inner_text()=="1 throws" - assert editor.locator("#vtStatus").inner_text()=="ECHO TAIL" + reply_snapshot(page,state,{**DEFAULTS,"mode":0,"wet":rotary["settings"]["wet"]},count=1,tail=True) + assert editor.locator("#vtCount").inner_text()=="1" + assert editor.locator("#vtStatus").inner_text()=="TAIL" + assert editor.locator("#vtThrow").get_attribute("data-tail")=="true" + assert not editor.locator("#vtThrow").is_disabled() # Real native tempo-source command (not a browser-only BPM guess). source_menu=editor.locator("#vtMusicSource") assert source_menu.locator('option[value="'+RECEIVER+'"]').count()==1 source_menu.select_option(RECEIVER) request=last(page,"nativeThrowTempoSource") assert request["sourceChannelId"]==RECEIVER and request["channelId"]==SOURCE - assert editor.locator("#vtMusicStatus").inner_text().startswith("Validating") + assert editor.locator("#vtMusicStatus").inner_text()=="CONNECT" emit(page,"arMixBuiltinThrowTempoAck",{ "requestId":request["requestId"],"status":"APPLIED", "sourceChannelId":RECEIVER}) reply_snapshot(page,state, - {**DEFAULTS,"mode":0} if width==1366 else DEFAULTS, + {**DEFAULTS,"mode":0,"wet":rotary["settings"]["wet"]} if width==1366 else DEFAULTS, count=1 if width==1366 else 0,tail=width==1366, music={"source":RECEIVER,"bpm":120,"confidence":.85}) - assert "AUTO 120 BPM" in editor.locator("#vtMusicStatus").inner_text() - assert "BPM only" in editor.locator("#vtMusicStatus").inner_text() - assert editor.locator("#vtClockLabel").inner_text()=="AUTO BPM" + assert editor.locator("#vtMusicStatus").inner_text()=="120 · BPM" + assert editor.locator("#vtClockLabel").inner_text()=="AUTO" # Snapshot transport is request/response, not unsolicited push. # Wait for a fresh native read request before testing a second # DSP status update; a replay of the prior request is ignored. @@ -170,11 +286,11 @@ def main(): # Confidence-approved grid is a separate native fact; the GUI # must never fabricate it from BPM alone. reply_snapshot(page,state, - {**DEFAULTS,"mode":0} if width==1366 else DEFAULTS, + {**DEFAULTS,"mode":0,"wet":rotary["settings"]["wet"]} if width==1366 else DEFAULTS, count=1 if width==1366 else 0,tail=width==1366, music={"source":RECEIVER,"bpm":120,"confidence":.85,"grid":True}) - assert "BEAT GRID" in editor.locator("#vtMusicStatus").inner_text() - assert editor.locator("#vtClockLabel").inner_text()=="GRID LOCK" + assert editor.locator("#vtMusicStatus").inner_text()=="120 · GRID" + assert editor.locator("#vtClockLabel").inner_text()=="LOCK" if width==1366: # The next changed graph invalidates the old editor instance. state["graph"]["channels"][0]["inserts"][0]["id"]="replaced-instance"