-
-
-
-
{value} BPM
-
+
+
+
+
+ {value} BPM
+
);
}
-// ── Global Settings ──
-export default function GlobalSettings({ onClose, onMasterVolume, onAudioProfile, onRoutingChange }) {
+// ── Global Settings ─────────────────────────────────────────────────────────
+
+export default function GlobalSettings({ onClose, onMasterVolume, onAudioProfile, onRoutingChange, onSaveSettings }) {
const [values, setValues] = useState(buildDefaults());
const [loaded, setLoaded] = useState(false);
- // ── Load current settings from API on mount ──
useEffect(() => {
let cancelled = false;
Promise.all([
@@ -363,18 +303,15 @@ export default function GlobalSettings({ onClose, onMasterVolume, onAudioProfile
]).then(([state, audioProfile, routing]) => {
if (cancelled) return;
const overrides = {};
- // From /api/state
if (state) {
if (state.master_volume != null) overrides.master_volume = Math.round(state.master_volume * 100);
if (state.sample_rate != null) overrides.sample_rate = String(state.sample_rate);
if (state.channel_mode) overrides.channel_mode = state.channel_mode;
}
- // From /api/audio/profile (more accurate for rate/period)
if (audioProfile) {
if (audioProfile.rate != null) overrides.sample_rate = String(audioProfile.rate);
if (audioProfile.period != null) overrides.buffer_size = String(audioProfile.period);
}
- // From /api/routing
if (routing) {
if (routing.routing_mode) overrides.routing_mode = routing.routing_mode;
if (routing.routing_breakpoint != null) overrides.routing_breakpoint = String(routing.routing_breakpoint);
@@ -391,123 +328,55 @@ export default function GlobalSettings({ onClose, onMasterVolume, onAudioProfile
setValues(prev => {
const next = { ...prev, [key]: val };
- // Fire external callbacks
- if (key === "master_volume") {
- onMasterVolume?.(val);
- }
- if (key === "sample_rate" || key === "buffer_size") {
+ // Route via dedicated endpoints
+ if (key === "master_volume") onMasterVolume?.(val);
+
+ else if (key === "sample_rate" || key === "buffer_size") {
const rate = key === "sample_rate" ? val : (next.sample_rate || "48000");
const period = key === "buffer_size" ? val : (next.buffer_size || "512");
onAudioProfile?.(parseInt(rate), parseInt(period));
}
- if (key === "routing_mode" || key === "routing_breakpoint") {
+
+ else if (key === "routing_mode" || key === "routing_breakpoint") {
const mode = key === "routing_mode" ? val : (next.routing_mode || "mono");
const bp = key === "routing_breakpoint" ? val : (next.routing_breakpoint || "7");
onRoutingChange?.(mode, parseInt(bp));
}
+ else {
+ // All other settings → POST /api/settings (generic persistence)
+ onSaveSettings?.({ [key]: val });
+ }
+
return next;
});
- }, [onMasterVolume, onAudioProfile, onRoutingChange]);
+ }, [onMasterVolume, onAudioProfile, onRoutingChange, onSaveSettings]);
return (
-
- {/* Header */}
-
+
+
-
+
-
Global Settings
- {!loaded &&
Loading current values…}
+
Settings
+ {!loaded &&
Loading…}
- {/* Body */}
-
+
{groups.map(([groupName, settings]) => (
- {/* Group header */}
-
- {groupName}
-
-
- {/* Settings */}
-
+
{groupName}
+
{settings.map(s => (
-
- {/* Icon */}
-
- {s.icon}
-
- {/* Control */}
+
+
{s.icon}
- {s.type === "slider" && (
- update(s.key, v)}
- />
- )}
- {s.type === "select" && (
- update(s.key, v)}
- />
- )}
- {s.type === "toggle" && (
- update(s.key, v)}
- />
- )}
- {s.type === "bpm" && (
- update(s.key, v)}
- />
- )}
+ {s.type === "slider" && update(s.key, v)} />}
+ {s.type === "select" && update(s.key, v)} />}
+ {s.type === "toggle" && update(s.key, v)} />}
+ {s.type === "bpm" && update(s.key, v)} />}
))}