From cbfa09a2daa11a46485f61aa9d097f1dc9d6bdfa Mon Sep 17 00:00:00 2001 From: "Jade (Rose) Rowland" Date: Sat, 6 Apr 2024 17:31:56 -0400 Subject: [PATCH] remove unessecary changes --- packages/core/clockworker.js | 1 - packages/core/neocyclist.mjs | 9 ++++----- packages/desktopbridge/midibridge.mjs | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/core/clockworker.js b/packages/core/clockworker.js index b10db186..4c33de29 100644 --- a/packages/core/clockworker.js +++ b/packages/core/clockworker.js @@ -46,7 +46,6 @@ const sendTick = (phase, duration, tick, time) => { num_seconds_at_cps_change, num_seconds_since_cps_change, cycle, - phase, }); num_ticks_since_cps_change++; }; diff --git a/packages/core/neocyclist.mjs b/packages/core/neocyclist.mjs index dab83f38..4600d0ef 100644 --- a/packages/core/neocyclist.mjs +++ b/packages/core/neocyclist.mjs @@ -12,6 +12,7 @@ export class NeoCyclist { this.cps = 0.5; this.lastTick = 0; // absolute time when last tick (clock callback) happened this.getTime = getTime; // get absolute time + this.time_at_last_tick_message = 0; this.num_cycles_at_cps_change = 0; this.onToggle = onToggle; @@ -59,19 +60,18 @@ export class NeoCyclist { end, tickdeadline, cycle, - phase, } = payload; this.cps = cps; this.cycle = cycle; setTimeReference(num_seconds_at_cps_change, num_seconds_since_cps_change, tickdeadline); - processHaps(begin, end, num_cycles_at_cps_change, num_seconds_at_cps_change, phase); + processHaps(begin, end, num_cycles_at_cps_change, num_seconds_at_cps_change); this.time_at_last_tick_message = this.getTime(); }; - const processHaps = (begin, end, num_cycles_at_cps_change, seconds_at_cps_change, phase) => { + const processHaps = (begin, end, num_cycles_at_cps_change, seconds_at_cps_change) => { if (this.started === false) { return; } @@ -86,8 +86,7 @@ export class NeoCyclist { this.latency + this.worker_time_dif; const duration = hap.duration / this.cps; - const deadline = targetTime - phase; - onTrigger?.(hap, deadline, duration, this.cps, targetTime); + onTrigger?.(hap, 0, duration, this.cps, targetTime); } }); }; diff --git a/packages/desktopbridge/midibridge.mjs b/packages/desktopbridge/midibridge.mjs index 4bb9da29..87f94750 100644 --- a/packages/desktopbridge/midibridge.mjs +++ b/packages/desktopbridge/midibridge.mjs @@ -6,7 +6,7 @@ const OFF_MESSAGE = 0x80; const CC_MESSAGE = 0xb0; Pattern.prototype.midi = function (output) { - return this.onTrigger((time, hap, currentTime, cps, targetTime) => { + return this.onTrigger((time_deprecate, hap, currentTime, cps, targetTime) => { let { note, nrpnn, nrpv, ccn, ccv, velocity = 0.9, gain = 1 } = hap.value; //magic number to get audio engine to line up, can probably be calculated somehow const latency = 0.03;