Skip to content

linux-rust: refresh the audio card index on activation #686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mmatczuk wants to merge 1 commit into
base: linux/rust
Choose a base branch
from
Open

linux-rust: refresh the audio card index on activation #686

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions linux-rust/src/media_controller.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,18 +310,18 @@ impl MediaController {
return;
}

let device_index = state.device_index;
let mac = state.connected_device_mac.clone();
drop(state);

let mut current_device_index = device_index;

if current_device_index.is_none() {
warn!("Device index not found, trying to get it.");
current_device_index = self.get_audio_device_index(&mac).await;
if let Some(idx) = current_device_index {
// The card index changes on every reconnect, so a cached index goes
// stale as soon as the AirPods drop and come back -- and a stale index
// makes every check below fail against a nonexistent card. Resolve it
// fresh by MAC each time instead.
match self.get_audio_device_index(&mac).await {
Some(idx) => {
self.state.lock().await.device_index = Some(idx);
} else {
}
None => {
warn!("Could not get device index. Cannot activate A2DP profile.");
return;
}
Expand Down Expand Up @@ -1079,4 +1079,4 @@ async fn get_sink_name_by_mac(mac: &str) -> Option<String> {
})
.await
.unwrap_or(None)
}
}