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

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

diff --git a/tools/m17rt-mod/src/main.rs b/tools/m17rt-mod/src/main.rs
index 08973cb5d1f9386ea087207ccd349a273e1799dd..c616b2e8b0110247a8b40f67cf8c7170dd0aeae7 100644 (file)
--- a/tools/m17rt-mod/src/main.rs
+++ b/tools/m17rt-mod/src/main.rs
@@ -1,6 +1,8 @@
 use m17app::app::M17App;
 use m17app::app::M17App;

+use m17app::link_setup::M17Address;

 use m17app::soundmodem::{
 use m17app::soundmodem::{

-    InputRrcFile, InputSoundcard, NullInputSource, NullOutputSink, OutputRrcFile, Soundmodem,
+    InputRrcFile, InputSoundcard, NullInputSource, NullOutputSink, NullPtt, OutputRrcFile,
+    OutputSoundcard, Soundmodem,

 };
 use m17codec2::{Codec2Adapter, WavePlayer};
 use std::path::PathBuf;
 };
 use m17codec2::{Codec2Adapter, WavePlayer};
 use std::path::PathBuf;


@@ -8,13 +10,20 @@ use std::path::PathBuf;
 pub fn mod_test() {
     let in_path = PathBuf::from("../../../Data/test_vk7xt_8k.wav");
     let out_path = PathBuf::from("../../../Data/mymod.rrc");
 pub fn mod_test() {
     let in_path = PathBuf::from("../../../Data/test_vk7xt_8k.wav");
     let out_path = PathBuf::from("../../../Data/mymod.rrc");

-    let soundmodem =
-        Soundmodem::new_with_input_and_output(NullInputSource::new(), OutputRrcFile::new(out_path));
+    let output = OutputRrcFile::new(out_path);
+    //let output = OutputSoundcard::new();
+    let soundmodem = Soundmodem::new(NullInputSource::new(), output, NullPtt::new());

     let app = M17App::new(soundmodem);
     app.start();
     std::thread::sleep(std::time::Duration::from_secs(1));
     println!("Beginning playback...");
     let app = M17App::new(soundmodem);
     app.start();
     std::thread::sleep(std::time::Duration::from_secs(1));
     println!("Beginning playback...");

-    WavePlayer::play(in_path, app.tx());
+    WavePlayer::play(
+        in_path,
+        app.tx(),
+        &M17Address::from_callsign("VK7XT").unwrap(),
+        &M17Address::new_broadcast(),
+        0,
+    );

     println!("Playback complete, terminating in 5 secs");
     std::thread::sleep(std::time::Duration::from_secs(5));
 }
     println!("Playback complete, terminating in 5 secs");
     std::thread::sleep(std::time::Duration::from_secs(5));
 }