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

working

Browse source
This commit is contained in:
Jade (Rose) Rowland 2023-12-23 12:30:55 -05:00
parent 466574a856
commit 3776791239
3 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
packages/soundfonts/fontloader.mjs
View file

@ -1,6 +1,7 @@
import { noteToMidi, freqToMidi } from '@strudel.cycles/core'; import { noteToMidi, freqToMidi, _mod } from '@strudel.cycles/core';
import { getAudioContext, registerSound, getEnvelope } from '@strudel.cycles/webaudio'; import { getAudioContext, registerSound, getEnvelope } from '@strudel.cycles/webaudio';
import gm from './gm.mjs'; import gm from './gm.mjs';
import { getSoundIndex } from '../superdough/util.mjs';
let loadCache = {}; let loadCache = {};
async function loadFont(name) { async function loadFont(name) {
@ -130,9 +131,9 @@ export function registerSoundfonts() {
registerSound( registerSound(
name, name,
async (time, value, onended) => { async (time, value, onended) => {
const { n = 0 } = value; const n = getSoundIndex(value.n, fonts.length);
const { attack = 0.001, decay = 0.001, sustain = 1, release = 0.001 } = value; const { attack = 0.001, decay = 0.001, sustain = 1, release = 0.001 } = value;
const font = fonts[n % fonts.length]; const font = fonts[n];
const ctx = getAudioContext(); const ctx = getAudioContext();
const bufferSource = await getFontBufferSource(font, value, ctx); const bufferSource = await getFontBufferSource(font, value, ctx);
bufferSource.start(time); bufferSource.start(time);

10
packages/superdough/sampler.mjs
View file

@ -1,4 +1,4 @@
import { noteToMidi, valueToMidi, nanFallback } from './util.mjs'; import { noteToMidi, valueToMidi, getSoundIndex } from './util.mjs';
import { getAudioContext, registerSound } from './index.mjs'; import { getAudioContext, registerSound } from './index.mjs';
import { getEnvelope } from './helpers.mjs'; import { getEnvelope } from './helpers.mjs';
import { logger } from './logger.mjs'; import { logger } from './logger.mjs';
@ -31,10 +31,11 @@ export const getSampleBufferSource = async (s, n, note, speed, freq, bank, resol
transpose = midi - 36; // C3 is middle C transpose = midi - 36; // C3 is middle C
const ac = getAudioContext(); const ac = getAudioContext();
let sampleUrl; let sampleUrl;
if (Array.isArray(bank)) { if (Array.isArray(bank)) {
n = nanFallback(n, 0); const index = getSoundIndex(n, bank.length);
sampleUrl = bank[n % bank.length]; sampleUrl = bank[index];
} else { } else {
const midiDiff = (noteA) => noteToMidi(noteA) - midi; const midiDiff = (noteA) => noteToMidi(noteA) - midi;
// object format will expect keys as notes // object format will expect keys as notes
@ -45,7 +46,8 @@ export const getSampleBufferSource = async (s, n, note, speed, freq, bank, resol
null, null,
); );
transpose = -midiDiff(closest); // semitones to repitch transpose = -midiDiff(closest); // semitones to repitch
sampleUrl = bank[closest][n % bank[closest].length]; const index = getSoundIndex(n, bank[closest].length);
sampleUrl = bank[closest][index];
} }
if (resolveUrl) { if (resolveUrl) {
sampleUrl = await resolveUrl(sampleUrl); sampleUrl = await resolveUrl(sampleUrl);

7
packages/superdough/util.mjs
View file

@ -61,3 +61,10 @@ export function nanFallback(value, fallback) {
} }
return value; return value;
} }
// modulo that works with negative numbers e.g. _mod(-1, 3) = 2. Works on numbers (rather than patterns of numbers, as @mod@ from pattern.mjs does)
export const _mod = (n, m) => ((n % m) + m) % m;
// round to nearest int, negative numbers will output a subtracted index
export const getSoundIndex = (n, numSounds) => {
return _mod(Math.round(nanFallback(n, 0)), numSounds);
};