agw/gtk-ahfail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix: remove redundant volume_state=None, improve pactl volume parser for stereo sinks

Browse Source
This commit is contained in:
Asger Geel Weirsøe
2026-05-06 09:53:27 +02:00
parent 74e0f544a0
commit 355828d4d9
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/ahfail-gtklock/src/lib.rs
View File

@@ -142,6 +142,5 @@ pub unsafe extern "C" fn g_module_unload(_module: *mut c_void) {
state.animation = None; state.animation = None;
state.audio_uri = None; state.audio_uri = None;
state.config.deadzone = None; state.config.deadzone = None;
state.volume_state = None;
}); });
} }

13
crates/ahfail-ui/src/volume.rs
View File

@@ -69,9 +69,16 @@ fn get_current_volume() -> (u32, bool) {
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
fn parse_pactl_volume(output: &str) -> Option<u32> { fn parse_pactl_volume(output: &str) -> Option<u32> {
output.split('%').next() for token in output.split_whitespace() {
.and_then(|s| s.split_whitespace().last()) if let Some(pct) = token.strip_suffix('%') {
.and_then(|s| s.parse().ok()) if let Ok(v) = pct.parse::<u32>() {
if v <= 100 {
return Some(v);
}
}
}
}
None
} }
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]