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

superdough: add logger

Browse Source
This commit is contained in:
Felix Roos 2023-08-17 10:08:55 +02:00
parent 0c6a0720af
commit 8bdbc9ec4c
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/superdough/index.mjs
View File

@ -8,3 +8,4 @@ export * from './superdough.mjs';
export * from './sampler.mjs';
export * from './helpers.mjs';
export * from './synth.mjs';
export * from './logger.mjs';

7
packages/superdough/logger.mjs Normal file
View File

@ -0,0 +1,7 @@
let log = (msg) => console.log(msg);
export const logger = (...args) => log(...args);
export const setLogger = (fn) => {
log = fn;
};

11
packages/superdough/sampler.mjs
View File

@ -1,6 +1,7 @@
import { noteToMidi, valueToMidi } from './util.mjs';
import { getAudioContext, registerSound } from './index.mjs';
import { getEnvelope } from './helpers.mjs';
import { logger } from './logger.mjs';
const bufferCache = {}; // string: Promise<ArrayBuffer>
const loadCache = {}; // string: Promise<ArrayBuffer>
@ -24,7 +25,7 @@ function humanFileSize(bytes, si) {
export const getSampleBufferSource = async (s, n, note, speed, freq, bank, resolveUrl) => {
let transpose = 0;
if (freq !== undefined && note !== undefined) {
// logger('[sampler] hap has note and freq. ignoring note', 'warning');
logger('[sampler] hap has note and freq. ignoring note', 'warning');
}
let midi = valueToMidi({ freq, note }, 36);
transpose = midi - 36; // C3 is middle C
@ -64,7 +65,7 @@ export const getSampleBufferSource = async (s, n, note, speed, freq, bank, resol
export const loadBuffer = (url, ac, s, n = 0) => {
const label = s ? `sound "${s}:${n}"` : 'sample';
if (!loadCache[url]) {
//logger(`[sampler] load ${label}..`, 'load-sample', { url });
logger(`[sampler] load ${label}..`, 'load-sample', { url });
const timestamp = Date.now();
loadCache[url] = fetch(url)
.then((res) => res.arrayBuffer())
@ -72,7 +73,7 @@ export const loadBuffer = (url, ac, s, n = 0) => {
const took = Date.now() - timestamp;
const size = humanFileSize(res.byteLength);
// const downSpeed = humanFileSize(res.byteLength / took);
//logger(`[sampler] load ${label}... done! loaded ${size} in ${took}ms`, 'loaded-sample', { url });
logger(`[sampler] load ${label}... done! loaded ${size} in ${took}ms`, 'loaded-sample', { url });
const decoded = await ac.decodeAudioData(res);
bufferCache[url] = decoded;
return decoded;
@ -224,12 +225,12 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {
// asny stuff above took too long?
if (ac.currentTime > t) {
//logger(`[sampler] still loading sound "${s}:${n}"`, 'highlight');
logger(`[sampler] still loading sound "${s}:${n}"`, 'highlight');
// console.warn('sample still loading:', s, n);
return;
}
if (!bufferSource) {
//logger(`[sampler] could not load "${s}:${n}"`, 'error');
logger(`[sampler] could not load "${s}:${n}"`, 'error');
return;
}
bufferSource.playbackRate.value = Math.abs(speed) * bufferSource.playbackRate.value;

3
packages/superdough/superdough.mjs
View File

@ -11,6 +11,7 @@ import { clamp } from './util.mjs';
import workletsUrl from './worklets.mjs?url';
import { getFilter, gainNode } from './helpers.mjs';
import { map } from 'nanostores';
import { logger } from './logger.mjs';
export const soundMap = map();
export function registerSound(key, onTrigger, data = {}) {
@ -195,7 +196,7 @@ export const superdough = async (value, deadline, hapDuration) => {
return;
}
if (ac.currentTime > t) {
// logger('[webaudio] skip hap: still loading', ac.currentTime - t);
logger('[webaudio] skip hap: still loading', ac.currentTime - t);
return;
}
const chain = []; // audio nodes that will be connected to each other sequentially

4
packages/webaudio/webaudio.mjs
View File

@ -5,9 +5,11 @@ This program is free software: you can redistribute it and/or modify it under th
*/
import * as strudel from '@strudel.cycles/core';
import { superdough, getAudioContext } from 'superdough';
import { superdough, getAudioContext, setLogger } from 'superdough';
const { Pattern, logger } = strudel;
setLogger(logger);
const hap2value = (hap) => {
hap.ensureObjectValue();
return { ...hap.value, velocity: hap.context.velocity };