From a961829c63711bef1f14a5eb8e9cc54189678606 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Thu, 26 Nov 2020 17:11:22 +0700 Subject: [PATCH] Bug fixes from merges Using u8 for channel id throughtout Using simpler map_err Co-Authored-By: twistedddx --- src/bc/xml.rs | 4 ++-- src/bc_protocol.rs | 18 ++++-------------- src/bc_protocol/time.rs | 12 ++---------- src/config.rs | 2 +- src/main.rs | 2 +- 5 files changed, 10 insertions(+), 28 deletions(-) diff --git a/src/bc/xml.rs b/src/bc/xml.rs index 5f34261..2a83c9d 100644 --- a/src/bc/xml.rs +++ b/src/bc/xml.rs @@ -121,7 +121,7 @@ pub struct Preview { pub version: String, #[yaserde(rename = "channelId")] - pub channel_id: u32, + pub channel_id: u8, pub handle: u32, #[yaserde(rename = "streamType")] pub stream_type: String, @@ -137,7 +137,7 @@ pub struct Extension { pub user_name: Option, pub token: Option, #[yaserde(rename = "channelId")] - pub channel_id: Option, + pub channel_id: Option, } #[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index e3814d0..9309a2b 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -154,10 +154,7 @@ impl BcCamera { sub_login.send(legacy_login)?; - let legacy_reply = sub_login.rx.recv_timeout(RX_TIMEOUT).map_err(|e| match e { - std::sync::mpsc::RecvTimeoutError::Timeout => Error::TimeoutTimeout, - std::sync::mpsc::RecvTimeoutError::Disconnected => Error::TimeoutDropped, - })?; + let legacy_reply = sub_login.rx.recv_timeout(RX_TIMEOUT)?; let nonce; if let BcMeta {response_code: 0x01dd,..} = legacy_reply.meta { @@ -217,10 +214,7 @@ impl BcCamera { ); sub_login.send(modern_login)?; - let modern_reply = sub_login.rx.recv_timeout(RX_TIMEOUT).map_err(|e| match e { - std::sync::mpsc::RecvTimeoutError::Timeout => Error::TimeoutTimeout, - std::sync::mpsc::RecvTimeoutError::Disconnected => Error::TimeoutDropped, - })?; + let modern_reply = sub_login.rx.recv_timeout(RX_TIMEOUT)?; let device_info; match modern_reply.body { @@ -279,10 +273,7 @@ impl BcCamera { sub_ping.send(ping)?; - sub_ping.rx.recv_timeout(RX_TIMEOUT).map_err(|e| match e { - std::sync::mpsc::RecvTimeoutError::Timeout => Error::TimeoutTimeout, - std::sync::mpsc::RecvTimeoutError::Disconnected => Error::TimeoutDropped, - })?; + sub_ping.rx.recv_timeout(RX_TIMEOUT)?; Ok(()) } @@ -291,7 +282,6 @@ impl BcCamera { &self, data_outs: &mut GstOutputs, stream_name: &str, - channel_id: u32, ) -> Result { let connection = self .connection @@ -317,7 +307,7 @@ impl BcCamera { BcXml { preview: Some(Preview { version: xml_ver(), - channel_id, + channel_id: self.channel_id, handle: 0, stream_type: stream_name.to_string(), }), diff --git a/src/bc_protocol/time.rs b/src/bc_protocol/time.rs index c87ab2d..44ad836 100644 --- a/src/bc_protocol/time.rs +++ b/src/bc_protocol/time.rs @@ -24,11 +24,7 @@ impl BcCamera { sub_get_general.send(get)?; let msg = sub_get_general .rx - .recv_timeout(RX_TIMEOUT) - .map_err(|e| match e { - std::sync::mpsc::RecvTimeoutError::Timeout => Error::TimeoutTimeout, - std::sync::mpsc::RecvTimeoutError::Disconnected => Error::TimeoutDropped, - })?; + .recv_timeout(RX_TIMEOUT)?; if let BcBody::ModernMsg(ModernMsg { payload: @@ -118,11 +114,7 @@ impl BcCamera { sub_set_general.send(set)?; let msg = sub_set_general .rx - .recv_timeout(RX_TIMEOUT) - .map_err(|e| match e { - std::sync::mpsc::RecvTimeoutError::Timeout => Error::TimeoutTimeout, - std::sync::mpsc::RecvTimeoutError::Disconnected => Error::TimeoutDropped, - })?; + .recv_timeout(RX_TIMEOUT)?; Ok(()) } diff --git a/src/config.rs b/src/config.rs index 1c4e42e..dc836b8 100644 --- a/src/config.rs +++ b/src/config.rs @@ -101,7 +101,7 @@ fn default_tls_client_auth() -> String { "none".to_string() } -fn default_channel_id() -> u32 { +fn default_channel_id() -> u8 { 0 } diff --git a/src/main.rs b/src/main.rs index 0e4f8a0..4ae8036 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(outputs, stream_name, camera_config.channel_id) + camera.start_video(outputs, stream_name) })() .map_err(|err| CameraErr { connected, err }) }