use crate::tnc::{Tnc, TncError};
-use cpal::traits::DeviceTrait;
-use cpal::traits::HostTrait;
-use cpal::traits::StreamTrait;
-use cpal::{SampleFormat, SampleRate};
use log::debug;
use m17core::kiss::MAX_FRAME_LEN;
use m17core::modem::{Demodulator, Modulator, ModulatorAction, SoftDemodulator, SoftModulator};
}
impl Soundmodem {
- pub fn new_with_input_and_output<I: InputSource, O: OutputSink>(input: I, output: O) -> Self {
+ pub fn new<I: InputSource, O: OutputSink, P: Ptt>(input: I, output: O, ptt: P) -> Self {
// must create TNC here
let (event_tx, event_rx) = sync_channel(128);
let (kiss_out_tx, kiss_out_rx) = sync_channel(128);
kiss_out_tx,
Box::new(input),
Box::new(output),
+ Box::new(ptt),
);
Self {
event_tx,
kiss_out_tx: SyncSender<Arc<[u8]>>,
input: Box<dyn InputSource>,
output: Box<dyn OutputSink>,
+ mut ptt_driver: Box<dyn Ptt>,
) {
std::thread::spawn(move || {
// TODO: should be able to provide a custom Demodulator for a soundmodem
let mut ptt = false;
while let Ok(ev) = event_rx.recv() {
// Update clock on TNC before we do anything
- let sample_time = (start.elapsed().as_nanos() / 48000) as u64;
- tnc.set_now(sample_time);
+ let sample_time = start.elapsed();
+ let secs = sample_time.as_secs();
+ let nanos = sample_time.subsec_nanos();
+ // Accurate to within approx 1 sample
+ let now_samples = 48000 * secs + (nanos as u64 / 20833);
+ tnc.set_now(now_samples);
// Handle event
match ev {
input.start(event_tx.clone());
output.start(event_tx.clone(), out_buffer.clone());
}
- SoundmodemEvent::Close => break,
+ SoundmodemEvent::Close => {
+ ptt_driver.ptt_off();
+ break;
+ }
SoundmodemEvent::DidReadFromOutputBuffer { len, timestamp } => {
let (occupied, internal_latency) = {
let out_buffer = out_buffer.read().unwrap();
let new_ptt = tnc.ptt();
if new_ptt != ptt {
if new_ptt {
- // turn it on
+ ptt_driver.ptt_on();
} else {
- // turn it off
+ ptt_driver.ptt_off();
}
}
ptt = new_ptt;
fn close(&self);
}
-pub struct InputSoundcard {
- // TODO: allow for inversion both here and in output
- cpal_name: Option<String>,
- end_tx: Mutex<Option<Sender<()>>>,
-}
-
-impl InputSoundcard {
- pub fn new() -> Self {
- Self {
- cpal_name: None,
- end_tx: Mutex::new(None),
- }
- }
-
- pub fn new_with_card(card_name: String) -> Self {
- Self {
- cpal_name: Some(card_name),
- end_tx: Mutex::new(None),
- }
- }
-}
-
-impl InputSource for InputSoundcard {
- fn start(&self, samples: SyncSender<SoundmodemEvent>) {
- let (end_tx, end_rx) = channel();
- let cpal_name = self.cpal_name.clone();
- std::thread::spawn(move || {
- let host = cpal::default_host();
- let device = if let Some(name) = cpal_name.as_deref() {
- host.input_devices()
- .unwrap()
- .find(|d| d.name().unwrap() == name)
- .unwrap()
- } else {
- host.default_input_device().unwrap()
- };
- let mut configs = device.supported_input_configs().unwrap();
- let config = configs
- .find(|c| c.channels() == 1 && c.sample_format() == SampleFormat::I16)
- .unwrap()
- .with_sample_rate(SampleRate(48000));
- let stream = device
- .build_input_stream(
- &config.into(),
- move |data: &[i16], _info: &cpal::InputCallbackInfo| {
- let out: Vec<i16> = data.iter().map(|s| *s).collect();
- let _ = samples.try_send(SoundmodemEvent::BasebandInput(out.into()));
- },
- |e| {
- // TODO: abort?
- debug!("error occurred in soundcard input: {e:?}");
- },
- None,
- )
- .unwrap();
- stream.play().unwrap();
- let _ = end_rx.recv();
- });
- *self.end_tx.lock().unwrap() = Some(end_tx);
- }
-
- fn close(&self) {
- let _ = self.end_tx.lock().unwrap().take();
- }
-}
-
pub struct InputRrcFile {
path: PathBuf,
end_tx: Mutex<Option<Sender<()>>>,
if let Err(e) = samples.try_send(SoundmodemEvent::BasebandInput(buf.into())) {
debug!("overflow feeding soundmodem: {e:?}");
}
- next_tick = next_tick + TICK;
+ next_tick += TICK;
idx = 0;
std::thread::sleep(next_tick.duration_since(Instant::now()));
}
loop {
std::thread::sleep(next_tick.duration_since(Instant::now()));
- next_tick = next_tick + TICK;
+ next_tick += TICK;
if end_rx.try_recv() != Err(TryRecvError::Empty) {
break;
}
}
}
+impl Default for NullInputSource {
+ fn default() -> Self {
+ Self::new()
+ }
+}
+
pub struct OutputBuffer {
- idling: bool,
+ pub idling: bool,
// TODO: something more efficient
- samples: VecDeque<i16>,
- latency: Duration,
+ pub samples: VecDeque<i16>,
+ pub latency: Duration,
}
impl OutputBuffer {
}
}
+impl Default for OutputBuffer {
+ fn default() -> Self {
+ Self::new()
+ }
+}
+
pub trait OutputSink: Send + Sync + 'static {
fn start(&self, event_tx: SyncSender<SoundmodemEvent>, buffer: Arc<RwLock<OutputBuffer>>);
fn close(&self);
loop {
std::thread::sleep(next_tick.duration_since(Instant::now()));
- next_tick = next_tick + TICK;
+ next_tick += TICK;
if end_rx.try_recv() != Err(TryRecvError::Empty) {
break;
}
}
}
+impl Default for NullOutputSink {
+ fn default() -> Self {
+ Self::new()
+ }
+}
+
impl OutputSink for NullOutputSink {
fn start(&self, event_tx: SyncSender<SoundmodemEvent>, buffer: Arc<RwLock<OutputBuffer>>) {
let (end_tx, end_rx) = channel();
loop {
std::thread::sleep(next_tick.duration_since(Instant::now()));
- next_tick = next_tick + TICK;
+ next_tick += TICK;
if end_rx.try_recv() != Err(TryRecvError::Empty) {
break;
}
let mut buffer = buffer.write().unwrap();
let mut taken = 0;
for _ in 0..SAMPLES_PER_TICK {
- if !buffer.samples.pop_front().is_some() {
+ if buffer.samples.pop_front().is_none() {
if !buffer.idling {
debug!("null output had underrun");
let _ = event_tx.send(SoundmodemEvent::OutputUnderrun);
}
}
-pub struct OutputSoundcard {
- // TODO: allow for inversion both here and in output
- cpal_name: Option<String>,
- end_tx: Mutex<Option<Sender<()>>>,
+pub trait Ptt: Send + 'static {
+ fn ptt_on(&mut self);
+ fn ptt_off(&mut self);
}
-impl OutputSoundcard {
- pub fn new() -> Self {
- Self {
- cpal_name: None,
- end_tx: Mutex::new(None),
- }
- }
+/// There is no PTT because this TNC will never make transmissions on a real radio.
+pub struct NullPtt;
- pub fn new_with_card(card_name: String) -> Self {
- Self {
- cpal_name: Some(card_name),
- end_tx: Mutex::new(None),
- }
+impl NullPtt {
+ pub fn new() -> Self {
+ Self
}
}
-impl OutputSink for OutputSoundcard {
- fn start(&self, event_tx: SyncSender<SoundmodemEvent>, buffer: Arc<RwLock<OutputBuffer>>) {
- let (end_tx, end_rx) = channel();
- let cpal_name = self.cpal_name.clone();
- std::thread::spawn(move || {
- let host = cpal::default_host();
- let device = if let Some(name) = cpal_name.as_deref() {
- host.output_devices()
- .unwrap()
- .find(|d| d.name().unwrap() == name)
- .unwrap()
- } else {
- host.default_output_device().unwrap()
- };
- let mut configs = device.supported_output_configs().unwrap();
- // TODO: more error handling
- let config = configs
- .find(|c| c.channels() == 1 && c.sample_format() == SampleFormat::I16)
- .unwrap()
- .with_sample_rate(SampleRate(48000));
- let stream = device
- .build_output_stream(
- &config.into(),
- move |data: &mut [i16], info: &cpal::OutputCallbackInfo| {
- let mut taken = 0;
- let ts = info.timestamp();
- let latency = ts
- .playback
- .duration_since(&ts.callback)
- .unwrap_or(Duration::ZERO);
- let mut buffer = buffer.write().unwrap();
- buffer.latency = latency;
- for out in data.iter_mut() {
- if let Some(s) = buffer.samples.pop_front() {
- *out = s;
- taken += 1;
- } else if buffer.idling {
- *out = 0;
- } else {
- debug!("output soundcard had underrun");
- let _ = event_tx.send(SoundmodemEvent::OutputUnderrun);
- break;
- }
- }
- //debug!("latency is {} ms, taken {taken}", latency.as_millis());
- let _ = event_tx.send(SoundmodemEvent::DidReadFromOutputBuffer {
- len: taken,
- timestamp: Instant::now(),
- });
- },
- |e| {
- // TODO: abort?
- debug!("error occurred in soundcard output: {e:?}");
- },
- None,
- )
- .unwrap();
- stream.play().unwrap();
- let _ = end_rx.recv();
- });
- *self.end_tx.lock().unwrap() = Some(end_tx);
+impl Default for NullPtt {
+ fn default() -> Self {
+ Self::new()
}
+}
- fn close(&self) {
- let _ = self.end_tx.lock().unwrap().take();
- }
+impl Ptt for NullPtt {
+ fn ptt_on(&mut self) {}
+ fn ptt_off(&mut self) {}
}
projects / m17rt / blobdiff