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

xen/scale parity improvements

Browse source
This commit is contained in:
tyow 2026-01-30 14:12:31 -05:00
parent 993dc53e92
commit 7fc8f1c5c9
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
packages/xen/xen.mjs
View file

@ -4,7 +4,7 @@ Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/
This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import { register, _mod, parseNumeral } from '@strudel/core'; import { register, _mod, parseNumeral, removeUndefineds } from '@strudel/core';
export function edo(name) { export function edo(name) {
if (!/^[1-9]+[0-9]*edo$/.test(name)) { if (!/^[1-9]+[0-9]*edo$/.test(name)) {
@ -49,11 +49,20 @@ function xenOffset(xenScale, offset, index = 0) {
// scaleNameOrRatios: string || number[], steps?: number // scaleNameOrRatios: string || number[], steps?: number
export const xen = register('xen', function (scaleNameOrRatios, pat) { export const xen = register('xen', function (scaleNameOrRatios, pat) {
return pat.withHap((hap) => { return pat.withHaps((haps) => {
const scale = getXenScale(scaleNameOrRatios); haps = haps.map(hap=>{
const frequency = xenOffset(scale, parseNumeral(hap.value)); let hVal = hap.value
return hap.withValue(() => frequency); const isObject = typeof hVal === 'object';
}); // If hVal is a pure value, place it on `n` so that we interpret it as a scale degree
hVal = isObject ? hVal : { n: hVal };
const { n, value, ...otherValues } = hVal;
const scale = getXenScale(scaleNameOrRatios);
const frequency = xenOffset(scale, parseNumeral(hVal.n));
hap.value = isObject ? {...otherValues, freq: frequency } : frequency
return hap;
});
return removeUndefineds(haps)
})
}); });
export const tuning = register('tuning', function (ratios, pat) { export const tuning = register('tuning', function (ratios, pat) {