fix(alsa): support hw:CARD= without DEV= suffix

roderickvd · roderickvd · commit ea167cfd5c23 · 2026-05-25T22:04:46.000+02:00
diff --git a/src/host/alsa/mod.rs b/src/host/alsa/mod.rs
@@ -1670,10 +1670,12 @@ fn canonical_pcm_id(pcm_id: &str) -> String {
             Some((c, d)) => (c.trim(), d.trim()),
             None => (rest.trim(), "0"),
         };
-        if !card_str.contains('=') {
-            if let Ok(device) = device_str.parse::<u32>() {
-                return format!("{prefix}:CARD={card_str},DEV={device}");
+        if card_str.contains('=') {
+            if !rest.contains(',') {
+                return format!("{prefix}:{rest},DEV=0");
             }
+        } else if let Ok(device) = device_str.parse::<u32>() {
+            return format!("{prefix}:CARD={card_str},DEV={device}");
         }
     }
     pcm_id.to_owned()

Original file line number	Diff line number	Diff line change
`@@ -1670,10 +1670,12 @@ fn canonical_pcm_id(pcm_id: &str) -> String {`
`1670`	`1670`	`Some((c, d)) => (c.trim(), d.trim()),`
`1671`	`1671`	`None => (rest.trim(), "0"),`
`1672`	`1672`	`};`
`1673`		`- if !card_str.contains('=') {`
`1674`		`- if let Ok(device) = device_str.parse::<u32>() {`
`1675`		`- return format!("{prefix}:CARD={card_str},DEV={device}");`
	`1673`	`+ if card_str.contains('=') {`
	`1674`	`+ if !rest.contains(',') {`
	`1675`	`+ return format!("{prefix}:{rest},DEV=0");`
`1676`	`1676`	`}`
	`1677`	`+ } else if let Ok(device) = device_str.parse::<u32>() {`
	`1678`	`+ return format!("{prefix}:CARD={card_str},DEV={device}");`
`1677`	`1679`	`}`
`1678`	`1680`	`}`
`1679`	`1681`	`pcm_id.to_owned()`