mirror of
https://github.com/arabianq/pipewire-soundpad.git
synced 2026-04-28 06:21:23 +00:00
Fix daemon autostart issue caused by sync pipewire retry loop (#43)
At boot time, PipeWire takes some time to register the `pwsp-daemon` and `pwsp-virtual-mic` devices. Previously, the daemon's retry loop for `link_player_to_virtual_mic()` was synchronous and limited to 5 attempts (1.5 seconds total). This caused systemd autostarts to fail with a code 1 if the devices were not yet available. This change replaces the synchronous wait with an asynchronous `tokio::spawn` task. It will retry the link attempt up to 60 times with a 1-second delay without blocking the startup of the rest of the daemon. This prevents it from exiting abruptly during autostart. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
6114b9a7f8
commit
f01a0e656c
+18
-16
@@ -86,14 +86,15 @@ impl SoundpadGui {
|
||||
.as_ref()
|
||||
.and_then(|cd| dirs.iter().position(|x| x == cd));
|
||||
|
||||
let new_dir_index = match (current_dir_index, arrow_up_pressed, arrow_down_pressed) {
|
||||
(Some(i), true, false) => (i + dirs.len() - 1) % dirs.len(),
|
||||
(Some(i), false, true) => (i + 1) % dirs.len(),
|
||||
(Some(i), true, true) => i,
|
||||
(None, true, _) => dirs.len() - 1,
|
||||
(None, false, true) => 0,
|
||||
_ => return,
|
||||
};
|
||||
let new_dir_index =
|
||||
match (current_dir_index, arrow_up_pressed, arrow_down_pressed) {
|
||||
(Some(i), true, false) => (i + dirs.len() - 1) % dirs.len(),
|
||||
(Some(i), false, true) => (i + 1) % dirs.len(),
|
||||
(Some(i), true, true) => i,
|
||||
(None, true, _) => dirs.len() - 1,
|
||||
(None, false, true) => 0,
|
||||
_ => return,
|
||||
};
|
||||
|
||||
self.open_dir(&dirs[new_dir_index]);
|
||||
} else if self.app_state.current_dir.is_some() {
|
||||
@@ -109,14 +110,15 @@ impl SoundpadGui {
|
||||
.as_ref()
|
||||
.and_then(|f| files.iter().position(|x| x == f));
|
||||
|
||||
let new_files_index = match (current_files_index, arrow_up_pressed, arrow_down_pressed) {
|
||||
(Some(i), true, false) => (i + files.len() - 1) % files.len(),
|
||||
(Some(i), false, true) => (i + 1) % files.len(),
|
||||
(Some(i), true, true) => i,
|
||||
(None, true, _) => files.len() - 1,
|
||||
(None, false, true) => 0,
|
||||
_ => return,
|
||||
};
|
||||
let new_files_index =
|
||||
match (current_files_index, arrow_up_pressed, arrow_down_pressed) {
|
||||
(Some(i), true, false) => (i + files.len() - 1) % files.len(),
|
||||
(Some(i), false, true) => (i + 1) % files.len(),
|
||||
(Some(i), true, true) => i,
|
||||
(None, true, _) => files.len() - 1,
|
||||
(None, false, true) => 0,
|
||||
_ => return,
|
||||
};
|
||||
|
||||
self.app_state.selected_file = Some(files[new_files_index].clone());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user