diff --git a/frontend/src/lib/views/Sound.svelte b/frontend/src/lib/views/Sound.svelte
index b863d45..9c887a0 100644
--- a/frontend/src/lib/views/Sound.svelte
+++ b/frontend/src/lib/views/Sound.svelte
@@ -24,107 +24,154 @@
let output = $state(null);
let input = $state(null);
+ function pick(devices: SoundDevice[], defaultName: string | null): number {
+ const i = devices.findIndex((d) => d.name === defaultName);
+ return i >= 0 ? i : 0;
+ }
+
async function loadSection(kind: "sinks" | "sources", title: string): Promise {
- const section = await invoke<{ devices: SoundDevice[]; default_name: string | null }>("get_sound_section", { kind });
- const selected = Math.max(0, section.devices.findIndex((d) => d.name === section.default_name));
- return { kind, title, devices: section.devices, selected };
+ const section = await invoke<{ devices: SoundDevice[]; default_name: string | null }>("get_sound_section", {
+ kind,
+ });
+ return { kind, title, devices: section.devices, selected: pick(section.devices, section.default_name) };
}
onMount(async () => {
- output = await loadSection("sinks", "Output");
- input = await loadSection("sources", "Input");
+ try {
+ output = await loadSection("sinks", "Output");
+ input = await loadSection("sources", "Input");
+ } catch (e) {
+ console.error(e);
+ output = { kind: "sinks", title: "Output", devices: [], selected: 0 };
+ input = { kind: "sources", title: "Input", devices: [], selected: 0 };
+ }
});
+ function current(section: DeviceSection): SoundDevice | null {
+ return section.devices[section.selected] ?? section.devices[0] ?? null;
+ }
+
async function selectDevice(section: DeviceSection, index: number) {
+ const device = section.devices[index];
+ if (!device) return;
section.selected = index;
- await invoke("set_default_sound_device", { kind: section.kind, name: section.devices[index].name });
+ await invoke("set_default_sound_device", { kind: section.kind, name: device.name });
}
async function setVolume(section: DeviceSection, percent: number) {
- const device = section.devices[section.selected];
+ const device = current(section);
+ if (!device) return;
device.percent = percent;
- await invoke("set_sound_volume", { kind: section.kind, name: device.name, percent });
+ await invoke("set_sound_volume", { kind: section.kind, name: device.name, percent: Math.round(percent) });
}
async function setMute(section: DeviceSection, mute: boolean) {
- const device = section.devices[section.selected];
+ const device = current(section);
+ if (!device) return;
device.mute = mute;
await invoke("set_sound_mute", { kind: section.kind, name: device.name, mute });
}
-{#snippet deviceSection(section: DeviceSection | null)}
- {#if section}
-
- {#if section.devices.length === 0}
-
- {:else}
-
-
-
+{#snippet sectionCard(section: DeviceSection)}
+
+ {#if section.devices.length === 0}
+
+ {:else}
+ {#each section.devices as d, i (d.name + i)}
+
+ {/each}
+ {#if current(section)}
setVolume(section, Number(e.currentTarget.value))}
/>
- {section.devices[section.selected].percent}%
+ {Math.round(current(section)!.percent)}%
section.devices[section.selected].mute,
- (v) => setMute(section, v)
- }
+ bind:value={() => current(section)!.mute, (v) => setMute(section, v)}
/>
{/if}
-
- {/if}
+ {/if}
+
{/snippet}
-
- {@render deviceSection(output)}
- {@render deviceSection(input)}
+
+ {#if output}
+ {@render sectionCard(output)}
+ {/if}
+ {#if input}
+ {@render sectionCard(input)}
+ {/if}
-
-
+
+