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

formatting uzu/strudel#1944

Browse source
This commit is contained in:
tyow 2026-01-24 14:30:15 -05:00
parent 77ced19144
commit 6b525b4819
4 changed files with 180 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

21
packages/xen/tune.mjs
View file

@ -7,7 +7,6 @@ This program is free software: you can redistribute it and/or modify it under th
import Tune from './tunejs.js';
import { register } from '@strudel/core';
/**
* Assumes a numerical pattern of EDO steps. Accepts a scale name or list of frequencies (see all available names at the link on the reference). Returns a new pattern with all values mapped to a frequency ratio. Similar to `xen`.
* @name tune
@ -17,24 +16,24 @@ import { register } from '@strudel/core';
* @example
* "0 1 2 3 4 5".tune("hexany15").mul("220").freq()
* @example
* // You can set your root to be a
* // You can set your root to be a
* // particular note with getFreq:
* `"4 8 9 10 - - 5 7 9 11 - -".tune("tranh3")
* "4 8 9 10 - - 5 7 9 11 - -".tune("tranh3")
* .mul(getFreq('c3'))
* .freq().clip(.5).room(1)`
* .freq().clip(.5).room(1)
* @example
* // You can also give tune a list of
* // You can also give tune a list of
* // frequencies to use as the scale:
* "0 1 2 3 4".tune([
* 261.6255653006,
* 302.72962012827,
* 350.29154279212,
* 405.32593044476,
* 469.00678383895,
* 261.6255653006,
* 302.72962012827,
* 350.29154279212,
* 405.32593044476,
* 469.00678383895,
* 523.2511306012
* ]).mul(220).freq();
* @tags tonal
*/
*/
// Tune.scale seems to be in ratio format
export const tune = register('tune', (scale, pat) => {

31
packages/xen/xen.mjs
View file

@ -5,7 +5,7 @@ This program is free software: you can redistribute it and/or modify it under th
*/
import { register, _mod, parseNumeral, removeUndefineds } from '@strudel/core';
import Tune from './tunejs.js'
import Tune from './tunejs.js';
// returns a list of frequency ratios for given edo scale
export function edo(name) {
@ -31,18 +31,16 @@ const defaultBase = 220;
// Assumes a base of 220. Returns a filtered scale based on 'indices'
// NOTE: indices functionality is unused
function getXenScale(scale, indices) {
let tune = new Tune()
let tune = new Tune();
if (typeof scale === 'string') {
if (/^[1-9]+[0-9]*edo$/.test(scale)) {
scale = edo(scale);
} else if (presets[scale]) {
scale = presets[scale];
}
else if (tune.isValidScale(scale)) {
tune.loadScale(scale)
scale = tune.scale
}
else {
} else if (tune.isValidScale(scale)) {
tune.loadScale(scale);
scale = tune.scale;
} else {
throw new Error('unknown scale name: "' + scale + '"');
}
}
@ -53,7 +51,6 @@ function getXenScale(scale, indices) {
return scale.filter((_, i) => indices.includes(i));
}
function xenOffset(xenScale, offset, index = 0) {
const i = _mod(index + offset, xenScale.length);
const oct = Math.floor(offset / xenScale.length);
@ -68,7 +65,7 @@ function xenOffset(xenScale, offset, index = 0) {
/**
* Assumes a numerical pattern of EDO steps. Accepts all scale names of `tune` as well as any arbitrary edo scale. Returns a new pattern with all values mapped to their associated frequency, assuming a base frequency of 220hz.
*
*
* @name xen
* @returns Pattern
* @memberof Pattern
@ -78,18 +75,18 @@ function xenOffset(xenScale, offset, index = 0) {
* // A major tried in 31edo:
* "0 8 18".xen("31edo").freq().piano()
* @example
* // You can also use xen with frequency ratios.
* // You can also use xen with frequency ratios.
* // This is equivalent to the above:
* "0 1 2".xen([
* Math.pow(2, 0/31),
* Math.pow(2, 8/31),
* Math.pow(2, 18/31),
* Math.pow(2, 0/31),
* Math.pow(2, 8/31),
* Math.pow(2, 18/31),
* ]).freq().piano()
* @example
* // xen also supports all scale names that
* @example
* // xen also supports all scale names that
* // tune does:
* "0 1 2 3 4 5".xen("hexany15").freq()
* // equiv to:
* // equiv to:
* // "0 1 2 3 4 5".tune("hexany15").mul("220").freq()
*/