New Soundcard struct, use it in test programs

[m17rt] / m17codec2 / src / lib.rs

diff --git a/m17codec2/src/lib.rs b/m17codec2/src/lib.rs
index 5eb54a4d6d4f20b7c2721bc85b2f39e6afcb71d2..016acc78c49c2869ed0d58c78b2ac2705f5d7d62 100755 (executable)
--- a/m17codec2/src/lib.rs
+++ b/m17codec2/src/lib.rs
@@ -8,10 +8,7 @@ use m17app::adapter::StreamAdapter;
 use m17app::app::TxHandle;
 use m17app::link_setup::LinkSetup;
 use m17app::link_setup::M17Address;
 use m17app::app::TxHandle;
 use m17app::link_setup::LinkSetup;
 use m17app::link_setup::M17Address;

-use m17core::address::Address;
-use m17core::address::Callsign;
-use m17core::protocol::LsfFrame;
-use m17core::protocol::StreamFrame;
+use m17app::StreamFrame;

 use std::collections::VecDeque;
 use std::fs::File;
 use std::io::Write;
 use std::collections::VecDeque;
 use std::fs::File;
 use std::io::Write;


@@ -93,7 +90,7 @@ impl StreamAdapter for Codec2Adapter {
 
     fn tnc_closed(&self) {}
 
 
     fn tnc_closed(&self) {}
 

-    fn stream_began(&self, _lsf: LsfFrame) {
+    fn stream_began(&self, _link_setup: LinkSetup) {

         // for now we will assume:
         // - unencrypted
         // - data type is Voice (Codec2 3200), not Voice+Data
         // for now we will assume:
         // - unencrypted
         // - data type is Voice (Codec2 3200), not Voice+Data