Streams-R-Us
/
atem-connection-rs
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Not ticking

This commit is contained in:
Baud 2024-03-16 17:41:16 +00:00
parent 689138b282
commit 7e973af192
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
atem-connection-rs/src/atem.rs
View File

@ -68,7 +68,7 @@ impl Atem {
AtemEvent::Connected => { AtemEvent::Connected => {
log::info!("Atem connected"); log::info!("Atem connected");
} }
AtemEvent::Disconnected => todo!(), AtemEvent::Disconnected => todo!("Disconnected"),
AtemEvent::ReceivedCommands(commands) => { AtemEvent::ReceivedCommands(commands) => {
self.mutate_state(&mut state, &mut status, commands).await self.mutate_state(&mut state, &mut status, commands).await
} }
@ -142,14 +142,19 @@ impl Atem {
for command in commands { for command in commands {
match command.raw_name() { match command.raw_name() {
DESERIALIZE_VERSION_RAW_NAME => { DESERIALIZE_VERSION_RAW_NAME => {
log::debug!("Received version response");
*state = AtemState::default(); *state = AtemState::default();
*status = AtemConnectionStatus::Connecting *status = AtemConnectionStatus::Connecting
} }
DESERIALIZE_INIT_COMPLETE_RAW_NAME => *status = AtemConnectionStatus::Connected, DESERIALIZE_INIT_COMPLETE_RAW_NAME => {
log::debug!("Received init complete from ATEM");
*status = AtemConnectionStatus::Connected
}
DESERIALIZE_TIME_RAW_NAME => { DESERIALIZE_TIME_RAW_NAME => {
todo!("Time command") todo!("Time command")
} }
_ => { _ => {
log::debug!("Applying {} to state", command.raw_name());
command.apply_to_state(state); command.apply_to_state(state);
} }
} }

13
atem-connection-rs/src/atem_lib/atem_socket.rs
View File

@ -175,9 +175,12 @@ impl AtemSocket {
mut atem_message_rx: tokio::sync::mpsc::Receiver<AtemSocketMessage>, mut atem_message_rx: tokio::sync::mpsc::Receiver<AtemSocketMessage>,
cancel: tokio_util::sync::CancellationToken, cancel: tokio_util::sync::CancellationToken,
) { ) {
let mut interval = tokio::time::interval(Duration::from_millis(5));
while !cancel.is_cancelled() { while !cancel.is_cancelled() {
let tick = interval.tick();
select! { select! {
_ = cancel.cancelled() => {}, _ = cancel.cancelled() => {},
_ = tick => {},
message = atem_message_rx.recv() => { message = atem_message_rx.recv() => {
match message { match message {
Some(AtemSocketMessage::Connect { Some(AtemSocketMessage::Connect {
@ -189,6 +192,7 @@ impl AtemSocket {
connected_callbacks.push(result_callback); connected_callbacks.push(result_callback);
} }
if self.connect(address).await.is_err() { if self.connect(address).await.is_err() {
log::debug!("Connect failed");
let mut connected_callbacks = self.connected_callbacks.lock().await; let mut connected_callbacks = self.connected_callbacks.lock().await;
for callback in connected_callbacks.drain(0..) { for callback in connected_callbacks.drain(0..) {
let _ = callback.send(false); let _ = callback.send(false);
@ -232,10 +236,10 @@ impl AtemSocket {
} }
} }
}; };
}
self.tick().await; self.tick().await;
} }
}
pub async fn connect(&mut self, address: SocketAddr) -> Result<(), io::Error> { pub async fn connect(&mut self, address: SocketAddr) -> Result<(), io::Error> {
let socket = UdpSocket::bind("0.0.0.0:0").await?; let socket = UdpSocket::bind("0.0.0.0:0").await?;
@ -393,7 +397,7 @@ impl AtemSocket {
self.connection_state = ConnectionState::Established; self.connection_state = ConnectionState::Established;
self.last_received_packed_id = remote_packet_id; self.last_received_packed_id = remote_packet_id;
self.send_ack(remote_packet_id).await; self.send_ack(remote_packet_id).await;
self.on_connect(); self.on_connect().await;
return; return;
} }
@ -543,9 +547,9 @@ impl AtemSocket {
} }
} }
fn on_connect(&mut self) { async fn on_connect(&mut self) {
let _ = self.atem_event_tx.send(AtemEvent::Connected); let _ = self.atem_event_tx.send(AtemEvent::Connected);
let mut connected_callbacks = self.connected_callbacks.blocking_lock(); let mut connected_callbacks = self.connected_callbacks.lock().await;
for callback in connected_callbacks.drain(0..) { for callback in connected_callbacks.drain(0..) {
let _ = callback.send(false); let _ = callback.send(false);
} }
@ -556,6 +560,7 @@ impl AtemSocket {
} }
fn start_timers(&mut self) { fn start_timers(&mut self) {
log::debug!("Starting timers");
self.start_reconnect_timer(); self.start_reconnect_timer();
self.start_retransmit_timer(); self.start_retransmit_timer();
} }