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

Merge pull request #666 from daslyfe/osc_fixes

Browse Source 
fix osc bundle timestamp glitches caused by drifting clock
This commit is contained in:
Felix Roos 2023-08-18 15:59:20 +02:00 committed by GitHub
commit 824abb0406
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/osc/osc.mjs
View File

@ -5,6 +5,7 @@ This program is free software: you can redistribute it and/or modify it under th
*/ */
import OSC from 'osc-js'; import OSC from 'osc-js';
import { logger, parseNumeral, Pattern } from '@strudel.cycles/core'; import { logger, parseNumeral, Pattern } from '@strudel.cycles/core';
let connection; // Promise<OSC> let connection; // Promise<OSC>
@ -33,9 +34,6 @@ function connect() {
return connection; return connection;
} }
const latency = 0.1;
let startedAt = -1;
/** /**
* *
* Sends each hap as an OSC message, which can be picked up by SuperCollider or any other OSC-enabled software. * Sends each hap as an OSC message, which can be picked up by SuperCollider or any other OSC-enabled software.
@ -51,17 +49,16 @@ Pattern.prototype.osc = function () {
const osc = await connect(); const osc = await connect();
const cycle = hap.wholeOrPart().begin.valueOf(); const cycle = hap.wholeOrPart().begin.valueOf();
const delta = hap.duration.valueOf(); const delta = hap.duration.valueOf();
// time should be audio time of onset
// currentTime should be current time of audio context (slightly before time)
if (startedAt < 0) {
startedAt = Date.now() - currentTime * 1000;
}
const controls = Object.assign({}, { cps, cycle, delta }, hap.value); const controls = Object.assign({}, { cps, cycle, delta }, hap.value);
// make sure n and note are numbers // make sure n and note are numbers
controls.n && (controls.n = parseNumeral(controls.n)); controls.n && (controls.n = parseNumeral(controls.n));
controls.note && (controls.note = parseNumeral(controls.note)); controls.note && (controls.note = parseNumeral(controls.note));
const keyvals = Object.entries(controls).flat(); const keyvals = Object.entries(controls).flat();
const ts = Math.floor(startedAt + (time + latency) * 1000); // time should be audio time of onset
// currentTime should be current time of audio context (slightly before time)
const offset = (time - currentTime) * 1000;
// timestamp in milliseconds used to trigger the osc bundle at a precise moment
const ts = Math.floor(Date.now() + offset);
const message = new OSC.Message('/dirt/play', ...keyvals); const message = new OSC.Message('/dirt/play', ...keyvals);
const bundle = new OSC.Bundle([message], ts); const bundle = new OSC.Bundle([message], ts);
bundle.timestamp(ts); // workaround for https://github.com/adzialocha/osc-js/issues/60 bundle.timestamp(ts); // workaround for https://github.com/adzialocha/osc-js/issues/60