diff --git a/packages/osc/osc.mjs b/packages/osc/osc.mjs index e3b12823..72eb4e7f 100644 --- a/packages/osc/osc.mjs +++ b/packages/osc/osc.mjs @@ -22,13 +22,15 @@ let startedAt = -1; */ Pattern.prototype.osc = function () { return this._withHap((hap) => { - const onTrigger = (time, hap, currentTime, cps, cycle, delta) => { + const onTrigger = (time, hap, currentTime, cps) => { + const cycle = hap.wholeOrPart().begin.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: cps, cycle: cycle, delta: delta }, hap.value); + const controls = Object.assign({}, { cps, cycle, delta }, hap.value); const keyvals = Object.entries(controls).flat(); const ts = Math.floor(startedAt + (time + latency) * 1000); const message = new OSC.Message('/dirt/play', ...keyvals); diff --git a/packages/react/src/hooks/useRepl.mjs b/packages/react/src/hooks/useRepl.mjs index 8db4bb0c..99e697ee 100644 --- a/packages/react/src/hooks/useRepl.mjs +++ b/packages/react/src/hooks/useRepl.mjs @@ -57,14 +57,7 @@ function useRepl({ tune, defaultSynth, autolink = true, onEvent, onDraw: onDrawP /* console.warn('no instrument chosen', event); throw new Error(`no instrument chosen for ${JSON.stringify(event)}`); */ } else { - onTrigger( - time, - event, - currentTime, - 1 /* cps */, - event.wholeOrPart().begin.valueOf(), - event.duration.valueOf(), - ); + onTrigger(time, event, currentTime, 1 /* cps */); } } catch (err) { console.warn(err);