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

Merge pull request 'mondo: fix all + setcpm + setcps' (#1600) from mondo-fixes into main

Browse source 
Reviewed-on: https://codeberg.org/uzu/strudel/pulls/1600
This commit is contained in:
froos 2025-09-21 16:16:05 +02:00
commit 118086aff5
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
packages/core/repl.mjs
View file

@ -74,6 +74,14 @@ export function repl({
return silence; return silence;
}; };
// helper to get a patternified pure value out
function unpure(pat) {
if (pat._Pattern) {
return pat.__pure;
}
return pat;
}
const setPattern = async (pattern, autostart = true) => { const setPattern = async (pattern, autostart = true) => {
pattern = editPattern?.(pattern) || pattern; pattern = editPattern?.(pattern) || pattern;
await scheduler.setPattern(pattern, autostart); await scheduler.setPattern(pattern, autostart);
@ -85,7 +93,10 @@ export function repl({
const start = () => scheduler.start(); const start = () => scheduler.start();
const pause = () => scheduler.pause(); const pause = () => scheduler.pause();
const toggle = () => scheduler.toggle(); const toggle = () => scheduler.toggle();
const setCps = (cps) => scheduler.setCps(cps); const setCps = (cps) => {
scheduler.setCps(unpure(cps));
return silence;
};
/** /**
* Changes the global tempo to the given cycles per minute * Changes the global tempo to the given cycles per minute
@ -97,7 +108,10 @@ export function repl({
* setcpm(140/4) // =140 bpm in 4/4 * setcpm(140/4) // =140 bpm in 4/4
* $: s("bd*4,[- sd]*2").bank('tr707') * $: s("bd*4,[- sd]*2").bank('tr707')
*/ */
const setCpm = (cpm) => scheduler.setCps(cpm / 60); const setCpm = (cpm) => {
scheduler.setCps(unpure(cpm) / 60);
return silence;
};
// TODO - not documented as jsdoc examples as the test framework doesn't simulate enough context for `each` and `all`.. // TODO - not documented as jsdoc examples as the test framework doesn't simulate enough context for `each` and `all`..

2
packages/mondough/mondough.mjs
View file

@ -85,7 +85,7 @@ function evaluator(node, scope) {
let pat; let pat;
if (type === 'plain' && typeof variable !== 'undefined') { if (type === 'plain' && typeof variable !== 'undefined') {
// some function names are not patternable, so we skip reification here // some function names are not patternable, so we skip reification here
if (['!', 'extend', '@', 'expand', 'square', 'angle'].includes(value)) { if (['!', 'extend', '@', 'expand', 'square', 'angle', 'all', 'setcpm', 'setcps'].includes(value)) {
return variable; return variable;
} }
pat = reify(variable); pat = reify(variable);