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

Feat: better engine output device switching

Browse Source
This commit is contained in:
Raphaël Forment
2026-03-18 14:27:05 +01:00
parent 005155e486
commit 97a1a997f6
2 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/input/engine_page.rs
View File

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

36
src/state/audio.rs
View File

@@ -448,11 +448,19 @@ impl AudioSettings {
pub fn current_output_device_index(&self) -> usize { pub fn current_output_device_index(&self) -> usize {
match &self.config.output_device { match &self.config.output_device {
Some(name) => self Some(spec) => {
.output_devices if let Ok(idx) = spec.parse::<usize>() {
.iter() self.output_devices
.position(|d| &d.name == name) .iter()
.unwrap_or(0), .position(|d| d.index == idx)
.unwrap_or(0)
} else {
self.output_devices
.iter()
.position(|d| &d.name == spec)
.unwrap_or(0)
}
}
None => self None => self
.output_devices .output_devices
.iter() .iter()
@@ -463,11 +471,19 @@ impl AudioSettings {
pub fn current_input_device_index(&self) -> usize { pub fn current_input_device_index(&self) -> usize {
match &self.config.input_device { match &self.config.input_device {
Some(name) => self Some(spec) => {
.input_devices if let Ok(idx) = spec.parse::<usize>() {
.iter() self.input_devices
.position(|d| &d.name == name) .iter()
.unwrap_or(0), .position(|d| d.index == idx)
.unwrap_or(0)
} else {
self.input_devices
.iter()
.position(|d| &d.name == spec)
.unwrap_or(0)
}
}
None => self None => self
.input_devices .input_devices
.iter() .iter()