elias/strudel-docker
1
0
Fork 0
mirror of https://github.com/eliasstepanik/strudel-docker.git synced 2026-01-27 05:28:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

offset calc

Browse Source
This commit is contained in:
Jade (Rose) Rowland 2024-08-08 17:25:45 -04:00
parent 686247f0cb
commit 94ccfa631e
2 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
packages/desktopbridge/oscbridge.mjs
View File

@ -1,6 +1,7 @@
import { parseNumeral, Pattern, getEventOffsetMs } from '@strudel/core'; import { parseNumeral, Pattern, getEventOffsetMs } from '@strudel/core';
import { Invoke } from './utils.mjs'; import { Invoke } from './utils.mjs';
let offsetTime;
Pattern.prototype.osc = function () { Pattern.prototype.osc = function () {
return this.onTrigger(async (time, hap, currentTime, cps = 1, targetTime) => { return this.onTrigger(async (time, hap, currentTime, cps = 1, targetTime) => {
hap.ensureObjectValue(); hap.ensureObjectValue();
@ -12,9 +13,17 @@ Pattern.prototype.osc = function () {
controls.note && (controls.note = parseNumeral(controls.note)); controls.note && (controls.note = parseNumeral(controls.note));
const params = []; const params = [];
// console.log(time, currentTime)
const unixTimeSecs = Date.now() / 1000;
const timestamp = Math.round(Date.now() + getEventOffsetMs(targetTime, currentTime)); if (offsetTime == null) {
const unixTimeSecs = Date.now() / 1000;
offsetTime = unixTimeSecs - currentTime;
}
const timestamp = offsetTime + targetTime
// const timestamp = unixTimeSecs + (targetTime - currentTime)
console.log(offsetTime)
Object.keys(controls).forEach((key) => { Object.keys(controls).forEach((key) => {
const val = controls[key]; const val = controls[key];
const value = typeof val === 'number' ? val.toString() : val; const value = typeof val === 'number' ? val.toString() : val;
@ -29,15 +38,23 @@ Pattern.prototype.osc = function () {
}); });
}); });
const messagesfromjs = [];
if (params.length) { if (params.length === 0) {
messagesfromjs.push({ target: '/dirt/play', timestamp, params }); return
} }
const message = { target: '/dirt/play', timestamp, params };
setTimeout(() => {
Invoke('sendosc', { messagesfromjs: [message] });
});
// const messagesfromjs = [];
// if (params.length) {
// messagesfromjs.push({ target: '/dirt/play', timestamp, params });
// }
if (messagesfromjs.length) { // if (messagesfromjs.length) {
setTimeout(() => { // setTimeout(() => {
Invoke('sendosc', { messagesfromjs }); // Invoke('sendosc', { messagesfromjs });
}); // });
} // }
}); });
}; };

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

@ -6,13 +6,13 @@ use std::net::UdpSocket;
use serde::Deserialize; use serde::Deserialize;
use std::sync::Arc; use std::sync::Arc;
use std::thread::sleep; use std::thread::sleep;
use std::time::Duration; use std::time::{Duration, SystemTime, UNIX_EPOCH};
use tokio::sync::{mpsc, Mutex}; use tokio::sync::{mpsc, Mutex};
use crate::loggerbridge::Logger; use crate::loggerbridge::Logger;
pub struct OscMsg { pub struct OscMsg {
pub msg_buf: Vec<u8>, pub msg_buf: Vec<u8>,
pub timestamp: u64, pub timestamp: f64,
} }
pub struct AsyncInputTransmit { pub struct AsyncInputTransmit {
@ -106,7 +106,7 @@ pub struct Param {
#[derive(Deserialize)] #[derive(Deserialize)]
pub struct MessageFromJS { pub struct MessageFromJS {
params: Vec<Param>, params: Vec<Param>,
timestamp: u64, timestamp: f64,
target: String, target: String,
} }
// Called from JS // Called from JS
@ -127,9 +127,11 @@ pub async fn sendosc(
args.push(OscType::String(p.value)); args.push(OscType::String(p.value));
} }
} }
// let start = SystemTime::now().duration_since(UNIX_EPOCH).unwrap();
let time_delay = Duration::from_secs_f64(m.timestamp);
let duration_since_epoch = let duration_since_epoch =
Duration::from_millis(m.timestamp) + Duration::new(UNIX_OFFSET, 0); time_delay + Duration::new(UNIX_OFFSET, 0);
let seconds = u32::try_from(duration_since_epoch.as_secs()) let seconds = u32::try_from(duration_since_epoch.as_secs())
.map_err(|_| "bit conversion failed for osc message timetag")?; .map_err(|_| "bit conversion failed for osc message timetag")?;