fix(audio): validate saved device exists in current enumeration
- Clear stale device IDs from DB when they don't exist in enumeration - Add warning when device lookup fails in handleBackendDeviceChange - Add logging to set_audio_output_device command for debugging ALSA card numbers (hw:X,0) can change between boots when USB devices are connected/disconnected. This fix prevents using invalid device IDs that cause playback failures. cc
This commit is contained in:
1 parent
1e3aa7b0df
commit
67895aaa9b
2 files changed
+16
No files matched your search
@@ -292,6 +292,7 @@ pub fn set_audio_output_device(
|
||||
state: tauri::State<'_, AudioSettingsState>,
|
||||
device: Option<String>,
|
||||
) -> Result<(), String> {
|
||||
log::info!("Command: set_audio_output_device {:?}", device);
|
||||
let store = state.store.lock().map_err(|e| format!("Lock error: {}", e))?;
|
||||
store.set_output_device(device.as_deref())
|
||||
}
|
||||
|
||||
@@ -1234,6 +1234,8 @@
|
||||
await loadBackendDevices(settings.backend_type);
|
||||
|
||||
// Set selected device from backend devices
|
||||
// IMPORTANT: Validate that saved device still exists in current enumeration
|
||||
// Device IDs like hw:X,0 can change between boots when USB devices are connected/disconnected
|
||||
if (settings.output_device) {
|
||||
const device = backendDevices.find(d => d.id === settings.output_device);
|
||||
if (device) {
|
||||
@@ -1242,7 +1244,15 @@
|
||||
? device.description
|
||||
: (needsTranslation(device.name) ? getDevicePrettyName(device.name) : device.name);
|
||||
} else {
|
||||
// Saved device no longer exists - clear it from DB to prevent sync issues
|
||||
console.warn(`[Audio] Saved device '${settings.output_device}' not found in current enumeration. Resetting to System Default.`);
|
||||
outputDevice = 'System Default';
|
||||
try {
|
||||
await invoke('set_audio_output_device', { device: null });
|
||||
console.log('[Audio] Cleared stale device from database');
|
||||
} catch (err) {
|
||||
console.error('[Audio] Failed to clear stale device:', err);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@@ -1490,6 +1500,11 @@
|
||||
const deviceId = deviceName === 'System Default' ? null : device?.id ?? null;
|
||||
const maxSampleRate = device?.max_sample_rate ?? null;
|
||||
|
||||
// Warn if device lookup failed (possible sync issue between UI and deviceByDisplayName)
|
||||
if (deviceName !== 'System Default' && !device) {
|
||||
console.warn(`[Audio] Device lookup failed for '${deviceName}'. Available keys:`, Array.from(deviceByDisplayName.keys()));
|
||||
}
|
||||
|
||||
try {
|
||||
await invoke('set_audio_output_device', { device: deviceId });
|
||||
// Store device's max sample rate for quality limiting
|
||||
|
||||
Reference in new issue
Block a user