BuboBubo/Cagire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: device input name matching

Browse Source
This commit is contained in:
Raphaël Forment
2026-03-20 15:50:50 +01:00
parent f4a3e26d51
commit 609fe108bc
2 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/input/engine_page.rs
View File

@@ -247,16 +247,16 @@ pub(super) fn handle_engine_page(ctx: &mut InputContext, key: KeyEvent) -> Input
DevicesFocus::Output => {
let cursor = ctx.app.audio.output_list.cursor;
if cursor < ctx.app.audio.output_devices.len() {
let index = ctx.app.audio.output_devices[cursor].index;
ctx.dispatch(AppCommand::SetOutputDevice(index.to_string()));
let name = ctx.app.audio.output_devices[cursor].name.clone();
ctx.dispatch(AppCommand::SetOutputDevice(name));
ctx.app.save_settings(ctx.link);
}
}
DevicesFocus::Input => {
let cursor = ctx.app.audio.input_list.cursor;
if cursor < ctx.app.audio.input_devices.len() {
let index = ctx.app.audio.input_devices[cursor].index;
ctx.dispatch(AppCommand::SetInputDevice(index.to_string()));
let name = ctx.app.audio.input_devices[cursor].name.clone();
ctx.dispatch(AppCommand::SetInputDevice(name));
ctx.app.save_settings(ctx.link);
}
}

52
src/state/audio.rs
View File

@@ -532,17 +532,21 @@ impl AudioSettings {
pub fn current_output_device_index(&self) -> usize {
match &self.config.output_device {
Some(spec) => {
if let Ok(idx) = spec.parse::<usize>() {
self.output_devices
.iter()
.position(|d| d.index == idx)
.unwrap_or(0)
} else {
self.output_devices
.iter()
.position(|d| &d.name == spec)
.unwrap_or(0)
}
let spec_lower = spec.to_lowercase();
self.output_devices
.iter()
.position(|d| d.name == *spec)
.or_else(|| {
self.output_devices
.iter()
.position(|d| d.name.to_lowercase() == spec_lower)
})
.or_else(|| {
spec.parse::<usize>().ok().and_then(|idx| {
self.output_devices.iter().position(|d| d.index == idx)
})
})
.unwrap_or(0)
}
None => self
.output_devices
@@ -555,17 +559,21 @@ impl AudioSettings {
pub fn current_input_device_index(&self) -> usize {
match &self.config.input_device {
Some(spec) => {
if let Ok(idx) = spec.parse::<usize>() {
self.input_devices
.iter()
.position(|d| d.index == idx)
.unwrap_or(0)
} else {
self.input_devices
.iter()
.position(|d| &d.name == spec)
.unwrap_or(0)
}
let spec_lower = spec.to_lowercase();
self.input_devices
.iter()
.position(|d| d.name == *spec)
.or_else(|| {
self.input_devices
.iter()
.position(|d| d.name.to_lowercase() == spec_lower)
})
.or_else(|| {
spec.parse::<usize>().ok().and_then(|idx| {
self.input_devices.iter().position(|d| d.index == idx)
})
})
.unwrap_or(0)
}
None => self
.input_devices