hacklab/strudel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed prettier

Browse source
This commit is contained in:
Jade (Rose) Rowland 2024-08-11 12:50:14 -04:00
parent c2be2ed76a
commit 3cd31e4841
9 changed files with 24 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

11
packages/core/util.mjs
View file

@ -364,17 +364,16 @@ export function objectMap(obj, fn) {
return Object.fromEntries(Object.entries(obj).map(([k, v], i) => [k, fn(v, k, i)]));
}
// utility for averaging two clocks together to account for drift
export class ClockCollator {
constructor({getTargetClockTime = () => Date.now() / 1000, weight = 16, offsetDelta = .005, checkAfterTime = 2}) {
constructor({ getTargetClockTime = () => Date.now() / 1000, weight = 16, offsetDelta = 0.005, checkAfterTime = 2 }) {
this.offsetTime;
this.timeAtPrevOffsetSample;
this.prevOffsetTimes = [];
this.getTargetClockTime = getTargetClockTime
this.getTargetClockTime = getTargetClockTime;
this.weight = weight;
this.offsetDelta = offsetDelta
this.checkAfterTime = checkAfterTime
this.offsetDelta = offsetDelta;
this.checkAfterTime = checkAfterTime;
}
calculateTimestamp(currentTime, targetTime) {
@ -398,7 +397,7 @@ export class ClockCollator {
this.offsetTime = rollingOffsetTime;
}
}
const timestamp = this.offsetTime + targetTime;
return timestamp;
}

4
packages/desktopbridge/oscbridge.mjs
View file

@ -2,7 +2,7 @@ import { parseNumeral, Pattern, ClockCollator } from '@strudel/core';
import { Invoke } from './utils.mjs';
const collator = new ClockCollator({})
const collator = new ClockCollator({});
export async function oscTriggerTauri(t_deprecate, hap, currentTime, cps = 1, targetTime) {
hap.ensureObjectValue();
@ -15,7 +15,7 @@ export async function oscTriggerTauri(t_deprecate, hap, currentTime, cps = 1, ta
const params = [];
const timestamp = collator.calculateTimestamp(currentTime, targetTime)
const timestamp = collator.calculateTimestamp(currentTime, targetTime);
Object.keys(controls).forEach((key) => {
const val = controls[key];

8
packages/osc/osc.mjs
View file

@ -6,7 +6,7 @@ This program is free software: you can redistribute it and/or modify it under th
import OSC from 'osc-js';
import { logger, parseNumeral, Pattern, getEventOffsetMs, isNote, noteToMidi, ClockCollator } from '@strudel/core';
import { logger, parseNumeral, Pattern, isNote, noteToMidi, ClockCollator } from '@strudel/core';
let connection; // Promise<OSC>
function connect() {
@ -34,9 +34,9 @@ function connect() {
return connection;
}
const collator = new ClockCollator({})
const collator = new ClockCollator({});
export async function oscTrigger(t_deprecate, hap, currentTime, cps = 1, targetTime) {
export async function oscTrigger(t_deprecate, hap, currentTime, cps = 1, targetTime) {
hap.ensureObjectValue();
const osc = await connect();
const cycle = hap.wholeOrPart().begin.valueOf();
@ -54,7 +54,7 @@ export async function oscTrigger(t_deprecate, hap, currentTime, cps = 1, targetT
controls.bank && (controls.s = controls.bank + controls.s);
controls.roomsize && (controls.size = parseNumeral(controls.roomsize));
const keyvals = Object.entries(controls).flat();
const ts = Math.round(collator.calculateTimestamp(currentTime, targetTime) * 1000)
const ts = Math.round(collator.calculateTimestamp(currentTime, targetTime) * 1000);
const message = new OSC.Message('/dirt/play', ...keyvals);
const bundle = new OSC.Bundle([message], ts);

2
packages/osc/superdirtoutput.js
View file

@ -8,5 +8,5 @@ const trigger = isTauri() ? oscTriggerTauri : oscTrigger;
export const superdirtOutput = (hap, deadline, hapDuration, cps, targetTime) => {
const ctx = getAudioContext();
const currentTime = ctx.currentTime;
return trigger(null, hap, currentTime, cps, targetTime)
return trigger(null, hap, currentTime, cps, targetTime);
};

2
packages/webaudio/webaudio.mjs
View file

@ -20,8 +20,6 @@ export const webaudioOutputTrigger = (t, hap, ct, cps) => superdough(hap2value(h
export const webaudioOutput = (hap, deadline, hapDuration, cps, t) =>
superdough(hap2value(hap), t ? `=${t}` : deadline, hapDuration);
Pattern.prototype.webaudio = function () {
return this.onTrigger(webaudioOutputTrigger);
};