From 3cd31e48411df4af76fd2ae56e5c256ff74187c4 Mon Sep 17 00:00:00 2001 From: "Jade (Rose) Rowland" Date: Sun, 11 Aug 2024 12:50:14 -0400 Subject: [PATCH] fixed prettier --- packages/core/util.mjs | 11 +++++------ packages/desktopbridge/oscbridge.mjs | 4 ++-- packages/osc/osc.mjs | 8 ++++---- packages/osc/superdirtoutput.js | 2 +- packages/webaudio/webaudio.mjs | 2 -- .../components/panel/AudioEngineTargetSelector.jsx | 2 +- website/src/repl/components/panel/SettingsTab.jsx | 6 +++--- website/src/repl/util.mjs | 14 +++++++------- website/src/settings.mjs | 2 +- 9 files changed, 24 insertions(+), 27 deletions(-) diff --git a/packages/core/util.mjs b/packages/core/util.mjs index 0a07e5d4..c375de7b 100644 --- a/packages/core/util.mjs +++ b/packages/core/util.mjs @@ -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; } diff --git a/packages/desktopbridge/oscbridge.mjs b/packages/desktopbridge/oscbridge.mjs index a8ebf082..645f7b4f 100644 --- a/packages/desktopbridge/oscbridge.mjs +++ b/packages/desktopbridge/oscbridge.mjs @@ -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]; diff --git a/packages/osc/osc.mjs b/packages/osc/osc.mjs index 40869d7c..8c063095 100644 --- a/packages/osc/osc.mjs +++ b/packages/osc/osc.mjs @@ -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 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); diff --git a/packages/osc/superdirtoutput.js b/packages/osc/superdirtoutput.js index ee9de65c..7a08a3f5 100644 --- a/packages/osc/superdirtoutput.js +++ b/packages/osc/superdirtoutput.js @@ -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); }; diff --git a/packages/webaudio/webaudio.mjs b/packages/webaudio/webaudio.mjs index 1dfaca5a..44a68348 100644 --- a/packages/webaudio/webaudio.mjs +++ b/packages/webaudio/webaudio.mjs @@ -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); }; diff --git a/website/src/repl/components/panel/AudioEngineTargetSelector.jsx b/website/src/repl/components/panel/AudioEngineTargetSelector.jsx index 27d97c8f..fc894d02 100644 --- a/website/src/repl/components/panel/AudioEngineTargetSelector.jsx +++ b/website/src/repl/components/panel/AudioEngineTargetSelector.jsx @@ -8,7 +8,7 @@ export function AudioEngineTargetSelector({ target, onChange, isDisabled }) { onChange(target); }; const options = new Map([ - [audioEngineTargets.webaudio, audioEngineTargets.webaudio ], + [audioEngineTargets.webaudio, audioEngineTargets.webaudio], [audioEngineTargets.superdirt, 'superdirt (osc)'], ]); return ; diff --git a/website/src/repl/components/panel/SettingsTab.jsx b/website/src/repl/components/panel/SettingsTab.jsx index 5c813069..87a296d9 100644 --- a/website/src/repl/components/panel/SettingsTab.jsx +++ b/website/src/repl/components/panel/SettingsTab.jsx @@ -122,7 +122,7 @@ export function SettingsTab({ started }) { /> )} - {( + { - )} + } settingsMap.setKey('theme', theme)} /> @@ -242,7 +242,7 @@ export function SettingsTab({ started }) { if (r) { settingsMap.set(defaultSettings); } - }) + }); }} > restore default settings diff --git a/website/src/repl/util.mjs b/website/src/repl/util.mjs index 4592e8ea..1ad4b77f 100644 --- a/website/src/repl/util.mjs +++ b/website/src/repl/util.mjs @@ -102,10 +102,10 @@ export function confirmDialog(msg) { const confirmed = confirm(msg); if (confirmed instanceof Promise) { return confirmed; - } + } return new Promise((resolve) => { - resolve(confirmed) - }) + resolve(confirmed); + }); } let lastShared; @@ -116,7 +116,9 @@ export async function shareCode(codeToShare) { return; } - confirmDialog('Do you want your pattern to be public? If no, press cancel and you will get just a private link.').then(async (isPublic) => { + confirmDialog( + 'Do you want your pattern to be public? If no, press cancel and you will get just a private link.', + ).then(async (isPublic) => { const hash = nanoid(12); const shareUrl = window.location.origin + window.location.pathname + '?' + hash; const { error } = await supabase.from('code_v1').insert([{ code: codeToShare, hash, ['public']: isPublic }]); @@ -138,9 +140,7 @@ export async function shareCode(codeToShare) { // alert(message); logger(message); } - - }) - + }); } export const ReplContext = createContext(null); diff --git a/website/src/settings.mjs b/website/src/settings.mjs index def6754b..7c202e4c 100644 --- a/website/src/settings.mjs +++ b/website/src/settings.mjs @@ -33,7 +33,7 @@ export const defaultSettings = { panelPosition: 'right', userPatterns: '{}', audioDeviceName: defaultAudioDeviceName, - audioEngineTarget: audioEngineTargets.webaudio //webaudio | superdirt + audioEngineTarget: audioEngineTargets.webaudio, //webaudio | superdirt }; let search = null;