From e4f67ef3c26bd12b23aba0451a00e2fd6dda5a60 Mon Sep 17 00:00:00 2001 From: twistedddx Date: Fri, 14 Aug 2020 23:26:42 +0930 Subject: [PATCH] -allow setting channel_id --- src/bc_protocol.rs | 4 ++-- src/config.rs | 8 ++++++++ src/main.rs | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index dbee500..86bed5b 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -244,7 +244,7 @@ impl BcCamera { Ok(()) } - pub fn start_video(&self, data_out: &mut dyn Write, stream_name: &str) -> Result { + pub fn start_video(&self, data_out: &mut dyn Write, stream_name: &str, channel_id: u32) -> Result { let connection = self .connection .as_ref() @@ -261,7 +261,7 @@ impl BcCamera { BcXml { preview: Some(Preview { version: xml_ver(), - channel_id: 0, + channel_id: channel_id, handle: 0, stream_type: stream_name.to_string(), }), diff --git a/src/config.rs b/src/config.rs index dd2c370..765649a 100644 --- a/src/config.rs +++ b/src/config.rs @@ -71,6 +71,10 @@ pub struct CameraConfig { pub stream: String, pub permitted_users: Option>, + + #[validate(range(min = 0, max = 31, message = "Invalid channel", code = "channel_id"))] + #[serde(default = "default_channel_id")] + pub channel_id: u32, } #[derive(Debug, Deserialize, Validate, Clone)] @@ -107,6 +111,10 @@ fn default_tls_client_auth() -> String { "none".to_string() } +fn default_channel_id() -> u32 { + 0 +} + pub static RESERVED_NAMES: &[&str] = &["anyone", "anonymous"]; fn validate_username(name: &str) -> Result<(), ValidationError> { if name.trim().is_empty() { diff --git a/src/main.rs b/src/main.rs index 435cc79..0b2bc33 100644 --- a/src/main.rs +++ b/src/main.rs @@ -246,7 +246,7 @@ fn camera_main( "{}: Starting video stream {}", camera_config.name, stream_name ); - camera.start_video(output, stream_name) + camera.start_video(output, stream_name, camera_config.channel_id) })() .map_err(|err| CameraErr { connected, err }) }