Phase 1-4: Audio stack, mixer engine, MIDI, and network API
Lint & Validate / lint (push) Has been cancelled

P2-R1: ALSA + JACK2 low-latency config (scripts, quirks, tuning)
P2-R2: Carla integration (build scripts, 8ch rack config, NAM LV2 support)
P2-R3: Plugin manager, categories, blacklist, NAM model support
P3-R1: Mixer DSP engine (channel strip, routing matrix, bus mgr, automation)
P4-R1: MIDI engine (learn mode, clock sync, HID discovery, mapping store)
P4-R2: Network API (OSC server, FastAPI REST, WebSocket, auth, rate limiter)
P5-R1: Touchscreen UI evaluation + main entry point
docs: Audio stack, Carla integration, MIDI support, UI evaluation
tests: Full test suite (292 passing)
This commit is contained in:
2026-05-19 20:39:17 -04:00
parent 7b123762b5
commit 9cd8292acc
97 changed files with 26545 additions and 5 deletions
+294
View File
@@ -0,0 +1,294 @@
// RPi Audio Mixer — Web UI Application
let ws = null;
let sessionToken = null;
let connected = false;
let channelCount = 16;
let paramState = {}; // channel -> { param_type -> value }
// ── Logging ────────────────────────────────────────────────────────────
function log(msg, cls) {
const el = document.getElementById('log');
const div = document.createElement('div');
div.textContent = new Date().toLocaleTimeString() + ' ' + msg;
div.className = cls || '';
el.prepend(div);
if (el.children.length > 50) el.lastChild.remove();
}
// ── Connection ──────────────────────────────────────────────────────────
async function login() {
const apiKey = document.getElementById('apikey-input').value;
try {
const resp = await fetch('/api/v1/auth/login', {
method: 'POST',
headers: { 'Content-Type': 'application/json', 'X-API-Key': apiKey },
body: JSON.stringify({ api_key: apiKey }),
});
const data = await resp.json();
if (data.token) {
sessionToken = data.token;
document.getElementById('connect-btn').disabled = false;
log('Session obtained (expires in ' + data.expires_in + 's)', 'log-info');
// Auto-connect
connectWS();
} else {
log('Login failed: ' + JSON.stringify(data), 'log-error');
}
} catch (e) {
log('Login error: ' + e.message, 'log-error');
}
}
function connectWS() {
if (!sessionToken) {
log('No session token — login first', 'log-error');
return;
}
if (ws) ws.close();
const proto = location.protocol === 'https:' ? 'wss:' : 'ws:';
const url = proto + '//' + location.host + '/ws?session=' + sessionToken;
setStatus('connecting', '● Connecting...');
ws = new WebSocket(url);
ws.onopen = () => {
connected = true;
setStatus('connected', '● Connected');
document.getElementById('connect-btn').disabled = true;
log('WebSocket connected', 'log-state');
};
ws.onclose = (e) => {
connected = false;
setStatus('disconnected', '● Disconnected');
document.getElementById('connect-btn').disabled = false;
log('WebSocket closed: ' + (e.reason || 'code ' + e.code), 'log-error');
};
ws.onerror = () => log('WebSocket error', 'log-error');
ws.onmessage = handleMessage;
}
function disconnectWS() {
if (ws) ws.close();
}
function setStatus(cls, text) {
const el = document.getElementById('conn-status');
el.className = 'status ' + cls;
el.textContent = text;
}
// ── Message handling ────────────────────────────────────────────────────
function handleMessage(event) {
try {
const msg = JSON.parse(event.data);
switch (msg.type) {
case 'full_state':
handleFullState(msg.payload);
break;
case 'parameter_update':
handleParameterUpdate(msg.payload);
break;
case 'transport_command':
handleTransportUpdate(msg.payload);
break;
case 'error':
log('Server error: ' + msg.payload.message, 'log-error');
break;
default:
log('Unknown msg type: ' + msg.type, 'log-info');
}
} catch (e) {
log('Parse error: ' + e.message, 'log-error');
}
}
function handleFullState(state) {
log('Full state received: ' + (state.channels ? state.channels.length : 0) + ' channels', 'log-state');
if (state.channels) {
channelCount = state.channels.length;
buildChannelStrips(state.channels);
}
if (state.transport) {
updateTransportUI(state.transport);
}
if (state.master) {
updateMasterUI(state.master);
}
}
function handleParameterUpdate(payload) {
const { param_type, value, channel } = payload;
if (!paramState[channel]) paramState[channel] = {};
paramState[channel][param_type] = value;
updateChannelUI(channel, param_type, value);
if (param_type === 'master_volume') {
document.getElementById('master-vol-val').textContent = value.toFixed(1) + ' dB';
document.getElementById('master-fader').querySelector('input').value = value;
}
}
function handleTransportUpdate(payload) {
updateTransportUI(payload);
}
// ── Channel strip builder ───────────────────────────────────────────────
function buildChannelStrips(channels) {
const container = document.getElementById('channels');
container.innerHTML = '';
channels.forEach((ch, i) => {
const strip = document.createElement('div');
strip.className = 'channel-strip';
strip.id = 'ch-' + i;
const volDb = ch.volume_db !== undefined ? ch.volume_db : 0;
strip.innerHTML = `
<h4>${ch.label || 'CH' + (i + 1)}</h4>
<div class="fader-v">
<input type="range" min="-60" max="12" value="${volDb}" step="0.5" orient="vertical"
oninput="sendParam('volume', this.value, ${i})">
<span class="fader-label">Vol</span>
<span class="fader-value">${volDb.toFixed(1)} dB</span>
</div>
<div class="pan-knob">
<input type="range" min="-1" max="1" value="${ch.pan || 0}" step="0.05"
oninput="sendParam('pan', this.value, ${i})">
<div class="pan-value">Pan: ${((ch.pan || 0) * 100).toFixed(0)}%</div>
</div>
<div class="chan-buttons">
<button class="chan-btn${ch.mute ? ' muted' : ''}" id="mute-${i}"
onclick="toggleMute(${i})">M</button>
<button class="chan-btn${ch.solo ? ' soloed' : ''}" id="solo-${i}"
onclick="toggleSolo(${i})">S</button>
</div>
`;
container.appendChild(strip);
// Initialize state
if (!paramState[i]) paramState[i] = {};
paramState[i].mute = ch.mute || false;
paramState[i].solo = ch.solo || false;
paramState[i].volume = volDb;
paramState[i].pan = ch.pan || 0;
});
// Update channel count in master section context if needed
}
function updateChannelUI(channel, paramType, value) {
const strip = document.getElementById('ch-' + channel);
if (!strip) return;
switch (paramType) {
case 'volume': {
const fader = strip.querySelector('.fader-v input');
const label = strip.querySelector('.fader-value');
if (fader) fader.value = value;
if (label) label.textContent = value.toFixed(1) + ' dB';
break;
}
case 'pan': {
const knob = strip.querySelector('.pan-knob input');
const label = strip.querySelector('.pan-value');
if (knob) knob.value = value;
if (label) label.textContent = 'Pan: ' + (value * 100).toFixed(0) + '%';
break;
}
case 'mute': {
const btn = document.getElementById('mute-' + channel);
if (btn) {
btn.className = 'chan-btn' + (value >= 0.5 ? ' muted' : '');
}
break;
}
case 'solo': {
const btn = document.getElementById('solo-' + channel);
if (btn) {
btn.className = 'chan-btn' + (value >= 0.5 ? ' soloed' : '');
}
break;
}
}
}
function updateMasterUI(master) {
if (master.volume_db !== undefined) {
document.getElementById('master-fader').querySelector('input').value = master.volume_db;
document.getElementById('master-vol-val').textContent = master.volume_db.toFixed(1) + ' dB';
}
}
function updateTransportUI(transport) {
document.getElementById('btn-play').className = 'tbtn' + (transport.playing ? ' active' : '');
document.getElementById('btn-record').className = 'tbtn' + (transport.recording ? ' active' : '');
document.getElementById('btn-loop').className = 'tbtn' + (transport.loop ? ' active' : '');
if (transport.tempo_bpm) {
document.getElementById('tempo-display').textContent = transport.tempo_bpm.toFixed(1) + ' BPM';
}
if (transport.position_sec !== undefined) {
const secs = Math.floor(transport.position_sec);
const h = Math.floor(secs / 3600);
const m = Math.floor((secs % 3600) / 60);
const s = secs % 60;
document.getElementById('time-display').textContent =
String(h).padStart(2, '0') + ':' +
String(m).padStart(2, '0') + ':' +
String(s).padStart(2, '0');
}
}
function toggleMute(channel) {
const current = paramState[channel] && paramState[channel].mute ? 0 : 1;
sendParam('mute', current, channel);
}
function toggleSolo(channel) {
const current = paramState[channel] && paramState[channel].solo ? 0 : 1;
sendParam('solo', current, channel);
}
// ── Sending ─────────────────────────────────────────────────────────────
function sendParam(paramType, value, channel) {
if (!ws || ws.readyState !== WebSocket.OPEN) return;
const msg = {
type: 'parameter_update',
payload: {
param_type: String(paramType),
value: parseFloat(value),
channel: parseInt(channel),
timestamp: Date.now() / 1000,
},
};
ws.send(JSON.stringify(msg));
}
function sendTransport(command) {
if (!ws || ws.readyState !== WebSocket.OPEN) return;
ws.send(JSON.stringify({
type: 'transport_command',
payload: { command: command },
}));
}
// ── Startup ─────────────────────────────────────────────────────────────
// Auto-login on page load
window.addEventListener('DOMContentLoaded', () => {
log('Mixer UI loaded — login to connect', 'log-info');
// Auto-login with default key
login();
});
+56
View File
@@ -0,0 +1,56 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>RPi Audio Mixer</title>
<link rel="stylesheet" href="/style.css">
</head>
<body>
<div id="app">
<header id="toolbar">
<h1>RPi Audio Mixer</h1>
<div id="connection">
<span id="conn-status" class="status disconnected">● Disconnected</span>
<input type="text" id="apikey-input" placeholder="API Key" value="mixer-local" size="14">
<button id="login-btn" onclick="login()">Login</button>
<button id="connect-btn" onclick="connectWS()" disabled>Connect</button>
</div>
</header>
<div id="transport-bar">
<button class="tbtn" id="btn-play" onclick="sendTransport('play')">▶ Play</button>
<button class="tbtn" id="btn-stop" onclick="sendTransport('stop')">■ Stop</button>
<button class="tbtn" id="btn-record" onclick="sendTransport('record')">● Rec</button>
<button class="tbtn" id="btn-loop" onclick="sendTransport('loop')">↻ Loop</button>
<span id="tempo-display">120 BPM</span>
<span id="time-display">00:00:00</span>
</div>
<div id="mixer">
<div id="channels"></div>
<div id="master-section">
<h3>Master</h3>
<div class="fader-v" id="master-fader">
<input type="range" min="-60" max="12" value="0" step="0.5" orient="vertical"
oninput="sendParam('master_volume', this.value, -1)">
<span class="fader-label">Master</span>
<span class="fader-value" id="master-vol-val">0.0 dB</span>
</div>
<div class="master-controls">
<button id="btn-mute-master" onclick="sendParam('master_mute', 1, -1)">Mute</button>
<button id="btn-dim" onclick="sendParam('master_dim', 1, -1)">Dim</button>
<button id="btn-mono" onclick="sendParam('master_mono', 1, -1)">Mono</button>
</div>
</div>
</div>
<div id="log-panel">
<h3>Activity Log</h3>
<div id="log"></div>
</div>
</div>
<script src="/app.js"></script>
</body>
</html>
+284
View File
@@ -0,0 +1,284 @@
/* RPi Audio Mixer — Web UI Styles */
:root {
--bg: #1a1a2e;
--panel: #16213e;
--accent: #e94560;
--text: #eee;
--text-dim: #888;
--fader-track: #0f3460;
--fader-thumb: #e94560;
--btn-bg: #0f3460;
--btn-hover: #1a4a7a;
--channel-bg: #1a1a3e;
--connected: #00cc66;
--disconnected: #ff4444;
--warning: #ffaa00;
}
* { box-sizing: border-box; margin: 0; padding: 0; }
body {
font-family: 'Segoe UI', system-ui, sans-serif;
background: var(--bg);
color: var(--text);
height: 100vh;
overflow: hidden;
}
#app {
display: flex;
flex-direction: column;
height: 100vh;
}
/* Toolbar */
#toolbar {
display: flex;
justify-content: space-between;
align-items: center;
padding: 0.5rem 1rem;
background: var(--panel);
border-bottom: 2px solid var(--accent);
flex-shrink: 0;
}
#toolbar h1 {
font-size: 1.2rem;
color: var(--accent);
}
#connection {
display: flex;
align-items: center;
gap: 0.5rem;
}
#connection input {
padding: 0.3rem 0.5rem;
background: var(--bg);
color: var(--text);
border: 1px solid var(--text-dim);
border-radius: 4px;
font-size: 0.85rem;
}
#connection button {
padding: 0.3rem 0.8rem;
background: var(--btn-bg);
color: var(--text);
border: none;
border-radius: 4px;
cursor: pointer;
font-size: 0.85rem;
}
#connection button:hover { background: var(--btn-hover); }
#connection button:disabled { opacity: 0.5; cursor: not-allowed; }
.status {
font-size: 0.85rem;
font-weight: bold;
padding: 0.2rem 0.5rem;
border-radius: 4px;
}
.status.connected { color: var(--connected); }
.status.disconnected { color: var(--disconnected); }
.status.connecting { color: var(--warning); }
/* Transport */
#transport-bar {
display: flex;
align-items: center;
gap: 0.3rem;
padding: 0.4rem 1rem;
background: var(--panel);
border-bottom: 1px solid #333;
flex-shrink: 0;
}
.tbtn {
padding: 0.3rem 0.8rem;
background: var(--btn-bg);
color: var(--text);
border: none;
border-radius: 4px;
cursor: pointer;
font-size: 0.9rem;
min-width: 40px;
}
.tbtn:hover { background: var(--accent); }
.tbtn.active { background: var(--accent); }
#tempo-display, #time-display {
margin-left: 1rem;
font-size: 0.9rem;
color: var(--text-dim);
}
/* Mixer area */
#mixer {
display: flex;
flex: 1;
overflow-x: auto;
overflow-y: hidden;
padding: 0.5rem;
gap: 0.5rem;
min-height: 0;
}
#channels {
display: flex;
gap: 0.5rem;
flex: 1;
overflow-x: auto;
}
.channel-strip {
display: flex;
flex-direction: column;
align-items: center;
background: var(--channel-bg);
border-radius: 8px;
padding: 0.5rem;
min-width: 80px;
flex-shrink: 0;
gap: 0.3rem;
}
.channel-strip h4 {
font-size: 0.75rem;
color: var(--accent);
white-space: nowrap;
}
.fader-v {
display: flex;
flex-direction: column;
align-items: center;
flex: 1;
min-height: 120px;
}
.fader-v input[type="range"] {
writing-mode: bt-lr;
-webkit-appearance: slider-vertical;
width: 24px;
height: 120px;
flex: 1;
min-height: 80px;
background: var(--fader-track);
accent-color: var(--fader-thumb);
}
.fader-label {
font-size: 0.7rem;
color: var(--text-dim);
}
.fader-value {
font-size: 0.7rem;
color: var(--accent);
font-weight: bold;
}
.chan-buttons {
display: flex;
gap: 0.2rem;
}
.chan-btn {
padding: 0.15rem 0.4rem;
font-size: 0.65rem;
background: var(--btn-bg);
color: var(--text);
border: none;
border-radius: 3px;
cursor: pointer;
}
.chan-btn:hover { background: var(--btn-hover); }
.chan-btn.muted { background: var(--accent); }
.chan-btn.soloed { background: var(--warning); color: #000; }
.pan-knob {
width: 40px;
text-align: center;
}
.pan-knob input { width: 100%; accent-color: var(--accent); }
.pan-value { font-size: 0.65rem; color: var(--text-dim); }
/* Master section */
#master-section {
display: flex;
flex-direction: column;
align-items: center;
background: var(--channel-bg);
border-radius: 8px;
padding: 0.5rem;
min-width: 100px;
border-left: 2px solid var(--accent);
flex-shrink: 0;
}
#master-section h3 {
font-size: 0.85rem;
color: var(--accent);
margin-bottom: 0.5rem;
}
#master-section .fader-v input[type="range"] {
height: 160px;
}
.master-controls {
display: flex;
gap: 0.2rem;
margin-top: 0.5rem;
}
.master-controls button {
padding: 0.2rem 0.5rem;
font-size: 0.7rem;
background: var(--btn-bg);
color: var(--text);
border: none;
border-radius: 3px;
cursor: pointer;
}
.master-controls button:hover { background: var(--btn-hover); }
.master-controls button.active { background: var(--accent); }
/* Log panel */
#log-panel {
background: var(--panel);
border-top: 1px solid #333;
padding: 0.5rem;
flex-shrink: 0;
max-height: 150px;
overflow: hidden;
}
#log-panel h3 {
font-size: 0.8rem;
color: var(--text-dim);
margin-bottom: 0.3rem;
}
#log {
font-family: 'Cascadia Code', 'Fira Code', monospace;
font-size: 0.7rem;
color: var(--text-dim);
max-height: 110px;
overflow-y: auto;
line-height: 1.3;
}
#log .log-param { color: var(--accent); }
#log .log-state { color: var(--connected); }
#log .log-error { color: var(--disconnected); }
#log .log-info { color: var(--text-dim); }