Stereo support in soundmodem soundcards

[m17rt] / tools / m17rt-soundcards / src / main.rs

diff --git a/tools/m17rt-soundcards/src/main.rs b/tools/m17rt-soundcards/src/main.rs
index bc5b13d13bd7881dc2ed0a9c3eb44509b179ec32..1a82869704d006756eb83b254c7db7cb41dfbfd0 100644 (file)
--- a/tools/m17rt-soundcards/src/main.rs
+++ b/tools/m17rt-soundcards/src/main.rs
@@ -1,16 +1,63 @@
+use ascii_table::{Align, AsciiTable};

 use m17app::soundcard::Soundcard;
 use m17app::soundcard::Soundcard;

+use m17codec2::{rx::Codec2RxAdapter, tx::Codec2TxAdapter};

 
 fn main() {
 
 fn main() {

-    let inputs = Soundcard::supported_input_cards();
-    let outputs = Soundcard::supported_output_cards();
+    // On some platforms enumerating devices will emit junk to the terminal:
+    // https://github.com/RustAudio/cpal/issues/384
+    // To minimise the impact, enumerate first and put our output at the end.
+    let soundmodem_in = Soundcard::supported_input_cards();
+    let soundmodem_out = Soundcard::supported_output_cards();
+    let codec2_in = Codec2TxAdapter::supported_input_cards();
+    let codec2_out = Codec2RxAdapter::supported_output_cards();

 
 

-    println!("\nSupported Input Soundcards ({}):\n", inputs.len());
-    for i in inputs {
-        println!("{}", i);
-    }
+    println!("\nDetected sound cards compatible with M17 Rust Toolkit:");

 
 

-    println!("\nSupported Output Soundcards ({}):\n", outputs.len());
-    for o in outputs {
-        println!("{}", o);
-    }
+    generate_table(
+        "SOUNDMODEM",
+        "INPUT",
+        "OUTPUT",
+        &soundmodem_in,
+        &soundmodem_out,
+    );
+    generate_table("CODEC2 AUDIO", "TX", "RX", &codec2_in, &codec2_out);
+}
+
+fn generate_table(
+    heading: &str,
+    input: &str,
+    output: &str,
+    input_cards: &[String],
+    output_cards: &[String],
+) {
+    let mut merged: Vec<&str> = input_cards
+        .iter()
+        .chain(output_cards.iter())
+        .map(|s| s.as_str())
+        .collect();
+    merged.sort();
+    merged.dedup();
+    let yes = "OK";
+    let no = "";
+    let data = merged.into_iter().map(|c| {
+        [
+            c,
+            if input_cards.iter().any(|s| s == c) {
+                yes
+            } else {
+                no
+            },
+            if output_cards.iter().any(|s| s == c) {
+                yes
+            } else {
+                no
+            },
+        ]
+    });
+
+    let mut table = AsciiTable::default();
+    table.column(0).set_header(heading).set_align(Align::Left);
+    table.column(1).set_header(input).set_align(Align::Center);
+    table.column(2).set_header(output).set_align(Align::Center);
+    table.print(data);

 }
 }