X-Git-Url: https://code.octet-stream.net/m17rt/blobdiff_plain/3903e719137aba15d30dd58b8d917965ec602400..2fb25de49daca6ddff6f5af13bcf7c314aafafb3:/m17app/src/rtlsdr.rs?ds=inline diff --git a/m17app/src/rtlsdr.rs b/m17app/src/rtlsdr.rs index 658aca4..7829f96 100644 --- a/m17app/src/rtlsdr.rs +++ b/m17app/src/rtlsdr.rs @@ -5,7 +5,7 @@ use std::{ }; use crate::{ - error::M17Error, + error::{M17Error, SoundmodemError}, soundmodem::{InputSource, SoundmodemEvent}, }; @@ -26,8 +26,7 @@ impl RtlSdr { } impl InputSource for RtlSdr { - fn start(&self, tx: SyncSender) { - // TODO: error handling + fn start(&self, tx: SyncSender) -> Result<(), SoundmodemError> { let mut cmd = Command::new("rtl_fm") .args([ "-E", @@ -40,8 +39,7 @@ impl InputSource for RtlSdr { "48k", ]) .stdout(Stdio::piped()) - .spawn() - .unwrap(); + .spawn()?; let mut stdout = cmd.stdout.take().unwrap(); let mut buf = [0u8; 1024]; let mut leftover: Option = None; @@ -72,11 +70,13 @@ impl InputSource for RtlSdr { } }); *self.rtlfm.lock().unwrap() = Some(cmd); + Ok(()) } - fn close(&self) { + fn close(&self) -> Result<(), SoundmodemError> { if let Some(mut process) = self.rtlfm.lock().unwrap().take() { let _ = process.kill(); } + Ok(()) } }