Make netclient work against mrefd

[m17rt] / m17codec2 / src / tx.rs

diff --git a/m17codec2/src/tx.rs b/m17codec2/src/tx.rs
index a54d864a651ec000750dbab27dbfaa082c5e1c11..d9028fb7f5267ae1a56befa8eb10ec31d747514f 100644 (file)
--- a/m17codec2/src/tx.rs
+++ b/m17codec2/src/tx.rs
@@ -1,24 +1,24 @@
 use codec2::{Codec2, Codec2Mode};
 use codec2::{Codec2, Codec2Mode};

+use cpal::SampleFormat;
+use cpal::SampleRate;

 use cpal::traits::DeviceTrait;
 use cpal::traits::HostTrait;
 use cpal::traits::StreamTrait;
 use cpal::traits::DeviceTrait;
 use cpal::traits::HostTrait;
 use cpal::traits::StreamTrait;

-use cpal::SampleFormat;
-use cpal::SampleRate;

 use log::debug;
 use log::debug;

+use m17app::StreamFrame;

 use m17app::adapter::StreamAdapter;
 use m17app::app::TxHandle;
 use m17app::error::AdapterError;
 use m17app::link_setup::LinkSetup;
 use m17app::link_setup::M17Address;
 use m17app::adapter::StreamAdapter;
 use m17app::app::TxHandle;
 use m17app::error::AdapterError;
 use m17app::link_setup::LinkSetup;
 use m17app::link_setup::M17Address;

-use m17app::StreamFrame;

 use rubato::Resampler;
 use rubato::SincFixedOut;
 use rubato::SincInterpolationParameters;
 use std::path::PathBuf;
 use rubato::Resampler;
 use rubato::SincFixedOut;
 use rubato::SincInterpolationParameters;
 use std::path::PathBuf;

-use std::sync::mpsc;
-use std::sync::mpsc::channel;

 use std::sync::Arc;
 use std::sync::Mutex;
 use std::sync::Arc;
 use std::sync::Mutex;

+use std::sync::mpsc;
+use std::sync::mpsc::channel;

 use std::time::Duration;
 use std::time::Instant;
 
 use std::time::Duration;
 use std::time::Instant;