elias/strudel-docker
1
0
Fork 0
mirror of https://github.com/eliasstepanik/strudel-docker.git synced 2026-01-11 13:48:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

different time strats

Browse Source
This commit is contained in:
Jade Rowland 2023-09-03 17:36:21 -04:00
parent 62e3774ff7
commit 349d11e76d
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src-tauri/src/oscbridge.rs
View File

@ -1,7 +1,8 @@
use rosc::encoder; use rosc::encoder;
use rosc::{ OscMessage, OscPacket, OscType }; use rosc::{ OscMessage, OscPacket, OscType };
use std::net::UdpSocket; use std::net::UdpSocket;
use std::time::Duration;
use std::time::{ Duration, SystemTime, UNIX_EPOCH };
use std::sync::Arc; use std::sync::Arc;
use tokio::sync::{ mpsc, Mutex }; use tokio::sync::{ mpsc, Mutex };
use tokio::time::Instant; use tokio::time::Instant;
@ -9,8 +10,7 @@ use serde::Deserialize;
use std::thread::sleep; use std::thread::sleep;
pub struct OscMsg { pub struct OscMsg {
pub msg_buf: Vec<u8>, pub msg_buf: Vec<u8>,
pub instant: Instant, pub timestamp: u128,
pub offset: u64,
} }
pub struct AsyncInputTransmit { pub struct AsyncInputTransmit {
@ -51,13 +51,15 @@ pub fn init(
/* ........................................................... /* ...........................................................
Process queued messages Process queued messages
............................................................*/ ............................................................*/
loop { loop {
let mut message_queue = message_queue_clone.lock().await; let mut message_queue = message_queue_clone.lock().await;
println!("num messages {}", message_queue.len()); let current_time = SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_millis();
//iterate over each message, play and remove messages when they are ready //iterate over each message, play and remove messages when they are ready
message_queue.retain(|message| { message_queue.retain(|message| {
if message.instant.elapsed().as_millis() < message.offset.into() { println!("current_time {} message time {}", current_time, message.timestamp);
if current_time < message.timestamp {
return true; return true;
} }
sock.send_to(&message.msg_buf, to_addr.clone()).unwrap(); sock.send_to(&message.msg_buf, to_addr.clone()).unwrap();
@ -89,7 +91,7 @@ pub struct Param {
#[derive(Deserialize)] #[derive(Deserialize)]
pub struct MessageFromJS { pub struct MessageFromJS {
params: Vec<Param>, params: Vec<Param>,
offset: u64, timestamp: u128,
target: String, target: String,
} }
// Called from JS // Called from JS
@ -121,9 +123,8 @@ pub async fn sendosc(
.unwrap(); .unwrap();
let message_to_process = OscMsg { let message_to_process = OscMsg {
instant: Instant::now(),
msg_buf, msg_buf,
offset: m.offset, timestamp: m.timestamp,
}; };
messages_to_process.push(message_to_process); messages_to_process.push(message_to_process);
} }