diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index d036eaf..2a58eba 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -248,7 +248,7 @@ impl BcCamera { loop { trace!("Getting video message..."); let msg = sub_video.rx.recv_timeout(self.rx_timeout)?; - if let Bc { body: BcBody::ModernMsg(ModernMsg { binary: Some(binary), .. }), .. } = msg { + if let BcBody::ModernMsg(ModernMsg { binary: Some(binary), .. }) = msg.body { trace!("Got {} bytes of video data", binary.len()); data_out.write_all(binary.as_slice())?; } diff --git a/src/lib.rs b/src/lib.rs new file mode 100644 index 0000000..922d417 --- /dev/null +++ b/src/lib.rs @@ -0,0 +1,7 @@ +#![allow(dead_code)] +#![allow(unused_variables)] +pub mod bc; +pub mod bc_protocol; +pub mod gst; + +pub use bc_protocol::Error; diff --git a/src/main.rs b/src/main.rs index 92442e6..cf8aa4c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,28 +1,24 @@ -#![allow(dead_code)] -#![allow(unused_variables)] -mod bc; -mod bc_protocol; -mod config; -mod cmdline; -mod gst; - -use bc_protocol::BcCamera; -use config::{Config, CameraConfig}; -use cmdline::Opt; +use neolink::bc_protocol::BcCamera; +use neolink::gst::RtspServer; use err_derive::Error; -use gst::RtspServer; use log::*; use std::fs; use std::time::Duration; use std::io::Write; use structopt::StructOpt; +mod cmdline; +mod config; + +use config::{Config, CameraConfig}; +use cmdline::Opt; + #[derive(Debug, Error)] pub enum Error { #[error(display="Configuration parsing error")] ConfigError(#[error(source)] toml::de::Error), #[error(display="Communication error")] - ProtocolError(#[error(source)] bc_protocol::Error), + ProtocolError(#[error(source)] neolink::Error), #[error(display="I/O error")] IoError(#[error(source)] std::io::Error), } @@ -64,7 +60,7 @@ fn camera_loop(camera_config: &CameraConfig, output: &mut dyn Write) -> Result<( current_backoff = min_backoff; } match cam_err.err { - bc_protocol::Error::AuthFailed => { + neolink::Error::AuthFailed => { error!("Authentication failed to camera {}, not retrying", camera_config.name); return Err(cam_err.err.into()); } @@ -98,14 +94,14 @@ fn camera_main(camera_config: &CameraConfig, output: &mut dyn Write) -> Result<( struct CameraErr { connected: bool, - err: bc_protocol::Error, + err: neolink::Error, } impl CameraErr { - fn before_connect>(e: E) -> Self { + fn before_connect>(e: E) -> Self { CameraErr { connected: false, err: e.into() } } - fn after_connect>(e: E) -> Self { + fn after_connect>(e: E) -> Self { CameraErr { connected: true, err: e.into() } } }