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

fix: note2midi for notes without octave

Browse source
This commit is contained in:
Felix Roos 2025-06-07 22:36:54 +02:00
parent b000f2297d
commit 2f2bf5bf29
No known key found for this signature in database
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
packages/supradough/dough.mjs
View file

@ -457,7 +457,7 @@ let getDefaultValue = (key) => defaultDefaultValues[key];
const chromas = { c: 0, d: 2, e: 4, f: 5, g: 7, a: 9, b: 11 }; const chromas = { c: 0, d: 2, e: 4, f: 5, g: 7, a: 9, b: 11 };
const accs = { '#': 1, b: -1, s: 1, f: -1 }; const accs = { '#': 1, b: -1, s: 1, f: -1 };
const note2midi = (note, defaultOctave = 3) => { const note2midi = (note, defaultOctave = 3) => {
const [pc, acc = '', oct = defaultOctave] = let [pc, acc = '', oct = ''] =
String(note) String(note)
.match(/^([a-gA-G])([#bsf]*)([0-9]*)$/) .match(/^([a-gA-G])([#bsf]*)([0-9]*)$/)
?.slice(1) || []; ?.slice(1) || [];
@ -466,13 +466,14 @@ const note2midi = (note, defaultOctave = 3) => {
} }
const chroma = chromas[pc.toLowerCase()]; const chroma = chromas[pc.toLowerCase()];
const offset = acc?.split('').reduce((o, char) => o + accs[char], 0) || 0; const offset = acc?.split('').reduce((o, char) => o + accs[char], 0) || 0;
return (Number(oct) + 1) * 12 + chroma + offset; oct = Number(oct || defaultOctave);
return (oct + 1) * 12 + chroma + offset;
}; };
const getFrequency = (value) => { const getFrequency = (value) => {
let { note, freq } = value; let { note, freq } = value;
note = note || 36; note = note || 36;
if (typeof note === 'string') { if (typeof note === 'string') {
note = note2midi(note); // e.g. c3 => 48 note = note2midi(note, 3); // e.g. c3 => 48
} }
if (!freq && typeof note === 'number') { if (!freq && typeof note === 'number') {
freq = Math.pow(2, (note - 69) / 12) * 440; freq = Math.pow(2, (note - 69) / 12) * 440;