Spruce up the high-level API for specifying addresses for transmission

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

diff --git a/tools/m17rt-demod/src/main.rs b/tools/m17rt-demod/src/main.rs
index 1125c3aba1d21a2aedebfed9e52b2e42bdccccf2..9c229af22dd1d990610d7684e05b11ee334cb5d3 100755 (executable)
--- a/tools/m17rt-demod/src/main.rs
+++ b/tools/m17rt-demod/src/main.rs
@@ -1,14 +1,15 @@
 use m17app::app::M17App;
 use m17app::app::M17App;

-use m17app::soundmodem::{InputRrcFile, InputSoundcard, NullOutputSink, Soundmodem};
+use m17app::soundmodem::{InputRrcFile, InputSoundcard, NullOutputSink, NullPtt, Soundmodem};

 use m17codec2::Codec2Adapter;
 use std::path::PathBuf;
 
 pub fn m17app_test() {
     //let path = PathBuf::from("../../../Data/test_vk7xt.rrc");
     let path = PathBuf::from("../../../Data/mymod.rrc");
 use m17codec2::Codec2Adapter;
 use std::path::PathBuf;
 
 pub fn m17app_test() {
     //let path = PathBuf::from("../../../Data/test_vk7xt.rrc");
     let path = PathBuf::from("../../../Data/mymod.rrc");

+    //let path = PathBuf::from("../../../Data/mymod-noisy.raw");

     let source = InputRrcFile::new(path);
     //let source = InputSoundcard::new();
     let source = InputRrcFile::new(path);
     //let source = InputSoundcard::new();

-    let soundmodem = Soundmodem::new_with_input_and_output(source, NullOutputSink::new());
+    let soundmodem = Soundmodem::new(source, NullOutputSink::new(), NullPtt::new());

     let app = M17App::new(soundmodem);
     app.add_stream_adapter(Codec2Adapter::new());
     app.start();
     let app = M17App::new(soundmodem);
     app.add_stream_adapter(Codec2Adapter::new());
     app.start();