Joren/qbz
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(alsa): recognise iec958:/hdmi: prefixes in extract_card_name_from_device

Browse Source 
Device enumeration produces four "CARD=" alias shapes (front:, sysdefault:,
iec958:, hdmi:) but the extractor only handled the first two. When a user
selected an S/PDIF or HDMI device id, the downstream proc_found check
always returned false, so the device-not-found error message dropped to
the generic "disconnected, renamed, or handled by another app" wording
even when /proc/asound showed the card present.

Part of issue #331 — reporter's HifiBerry Digi2 Pro is S/PDIF-only, so
its id is iec958:CARD=sndrpihifiberry,DEV=0, and the missing prefix match
obscured the real cause of the open failure.

This commit is a pure parsing extension; behavior changes only in the
error message accuracy. The hw:/plughw: fallback attempt lands in the
next commit.

cc
This commit is contained in:
vicrodh committed 2026-04-20 20:09:27 -06:00
1 parent 38edf2d012
commit 05f0d69fcb
1 file changed
+14 -2
Download Patch File Download Diff File Expand all files Collapse all files
crates/qbz-audio/src/alsa_backend.rs
+14 -2
View File
@@ -273,9 +273,21 @@ fn find_card_number_by_name(short_name: &str) -> Option<String> {
/// Extract card name from an ALSA device ID.
/// `front:CARD=C20,DEV=0` -> `"C20"`, `hw:0,0` -> card 0 short name, etc.
///
/// Handles every alias shape `enumerate_with_proc_descriptions` produces:
/// `front:CARD=`, `sysdefault:CARD=`, `iec958:CARD=`, `hdmi:CARD=`, and the
/// raw `hw:N,M` / `plughw:N,M` forms. Missing any of these meant the
/// device-not-found error message downgraded to the generic "disconnected,
/// renamed, or handled by another app" wording for S/PDIF / HDMI devices
/// (issue #331 — HifiBerry Digi2 Pro is S/PDIF-only, so its selected id is
/// `iec958:CARD=sndrpihifiberry,DEV=0`).
fn extract_card_name_from_device(device_id: &str) -> Option<String> {
if device_id.starts_with("front:CARD=") || device_id.starts_with("sysdefault:CARD=") {
// front:CARD=C20,DEV=0 -> C20
if device_id.starts_with("front:CARD=")
|| device_id.starts_with("sysdefault:CARD=")
|| device_id.starts_with("iec958:CARD=")
|| device_id.starts_with("hdmi:CARD=")
{
// <prefix>:CARD=<name>,DEV=<n> -> <name>
let after_card = device_id.split("CARD=").nth(1)?;
Some(after_card.split(',').next()?.to_string())
} else if device_id.starts_with("hw:") || device_id.starts_with("plughw:") {