Add immediate triggering; move time to schedulerState
This commit is contained in:
parent
3a284696c9
commit
12cc1e9b5e
4 changed files with 79 additions and 8 deletions
|
|
@ -22,7 +22,7 @@ export * from './repl.mjs';
|
||||||
export * from './signal.mjs';
|
export * from './signal.mjs';
|
||||||
export * from './speak.mjs';
|
export * from './speak.mjs';
|
||||||
export * from './state.mjs';
|
export * from './state.mjs';
|
||||||
export * from './time.mjs';
|
export * from './schedulerState.mjs';
|
||||||
export * from './timespan.mjs';
|
export * from './timespan.mjs';
|
||||||
export * from './ui.mjs';
|
export * from './ui.mjs';
|
||||||
export * from './util.mjs';
|
export * from './util.mjs';
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ import { NeoCyclist } from './neocyclist.mjs';
|
||||||
import { Cyclist } from './cyclist.mjs';
|
import { Cyclist } from './cyclist.mjs';
|
||||||
import { evaluate as _evaluate } from './evaluate.mjs';
|
import { evaluate as _evaluate } from './evaluate.mjs';
|
||||||
import { errorLogger, logger } from './logger.mjs';
|
import { errorLogger, logger } from './logger.mjs';
|
||||||
import { setCpsFunc, setTime } from './time.mjs';
|
import { setCpsFunc, setPattern as exposeSchedulerPattern, setTime, setTriggerFunc } from './schedulerState.mjs';
|
||||||
import { evalScope } from './evaluate.mjs';
|
import { evalScope } from './evaluate.mjs';
|
||||||
import { register, Pattern, isPattern, silence, stack } from './pattern.mjs';
|
import { register, Pattern, isPattern, silence, stack } from './pattern.mjs';
|
||||||
import { reset_state } from './impure.mjs';
|
import { reset_state } from './impure.mjs';
|
||||||
|
|
@ -65,6 +65,7 @@ export function repl({
|
||||||
// NeoCyclist uses a shared worker to communicate between instances, which is not supported on mobile chrome
|
// NeoCyclist uses a shared worker to communicate between instances, which is not supported on mobile chrome
|
||||||
const scheduler =
|
const scheduler =
|
||||||
sync && typeof SharedWorker != 'undefined' ? new NeoCyclist(schedulerOptions) : new Cyclist(schedulerOptions);
|
sync && typeof SharedWorker != 'undefined' ? new NeoCyclist(schedulerOptions) : new Cyclist(schedulerOptions);
|
||||||
|
setTriggerFunc(schedulerOptions.onTrigger);
|
||||||
setCpsFunc(() => scheduler.cps);
|
setCpsFunc(() => scheduler.cps);
|
||||||
let pPatterns = {};
|
let pPatterns = {};
|
||||||
let anonymousIndex = 0;
|
let anonymousIndex = 0;
|
||||||
|
|
@ -90,6 +91,7 @@ export function repl({
|
||||||
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);
|
||||||
|
exposeSchedulerPattern(pattern);
|
||||||
return pattern;
|
return pattern;
|
||||||
};
|
};
|
||||||
setTime(() => scheduler.now()); // TODO: refactor?
|
setTime(() => scheduler.now()); // TODO: refactor?
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,13 @@
|
||||||
/*
|
/*
|
||||||
time.mjs - Core time module. Used to expose parameters from the Scheduler like `time` and `cps`
|
schedulerState.mjs - Module to pipe out various parameters from the scheduler for global consumption
|
||||||
Copyright (C) 2026 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/time.mjs>
|
Copyright (C) 2026 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/schedulerState.mjs>
|
||||||
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/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
let time;
|
let time;
|
||||||
let cpsFunc;
|
let cpsFunc;
|
||||||
|
let pattern;
|
||||||
|
let triggerFunc;
|
||||||
export function getTime() {
|
export function getTime() {
|
||||||
if (!time) {
|
if (!time) {
|
||||||
throw new Error('no time set! use setTime to define a time source');
|
throw new Error('no time set! use setTime to define a time source');
|
||||||
|
|
@ -24,3 +26,19 @@ export function setCpsFunc(func) {
|
||||||
export function getCps() {
|
export function getCps() {
|
||||||
return cpsFunc?.();
|
return cpsFunc?.();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function setPattern(pat) {
|
||||||
|
pattern = pat;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getPattern() {
|
||||||
|
return pattern;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function setTriggerFunc(func) {
|
||||||
|
triggerFunc = func;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getTriggerFunc() {
|
||||||
|
return triggerFunc;
|
||||||
|
}
|
||||||
|
|
@ -5,9 +5,22 @@ This program is free software: you can redistribute it and/or modify it under th
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import * as _WebMidi from 'webmidi';
|
import * as _WebMidi from 'webmidi';
|
||||||
import { Hap, Pattern, TimeSpan, getCps, getTime, isPattern, logger, ref, reify } from '@strudel/core';
|
import {
|
||||||
|
Hap,
|
||||||
|
Pattern,
|
||||||
|
TimeSpan,
|
||||||
|
getCps,
|
||||||
|
getPattern,
|
||||||
|
getTime,
|
||||||
|
getTriggerFunc,
|
||||||
|
isPattern,
|
||||||
|
logger,
|
||||||
|
ref,
|
||||||
|
reify,
|
||||||
|
} from '@strudel/core';
|
||||||
import { noteToMidi, getControlName } from '@strudel/core';
|
import { noteToMidi, getControlName } from '@strudel/core';
|
||||||
import { Note } from 'webmidi';
|
import { Note } from 'webmidi';
|
||||||
|
import { getAudioContext } from '@strudel/webaudio';
|
||||||
import { scheduleAtTime } from '../superdough/helpers.mjs';
|
import { scheduleAtTime } from '../superdough/helpers.mjs';
|
||||||
|
|
||||||
// if you use WebMidi from outside of this package, make sure to import that instance:
|
// if you use WebMidi from outside of this package, make sure to import that instance:
|
||||||
|
|
@ -575,6 +588,33 @@ export async function midin(input) {
|
||||||
*/
|
*/
|
||||||
const kHaps = {};
|
const kHaps = {};
|
||||||
const kListeners = {};
|
const kListeners = {};
|
||||||
|
|
||||||
|
function triggerKbNow(input, cps, now, latencyCycles) {
|
||||||
|
const pattern = getPattern();
|
||||||
|
const trigger = getTriggerFunc();
|
||||||
|
if (!pattern || !trigger) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
const t = now + latencyCycles;
|
||||||
|
const eps = 1e-6;
|
||||||
|
const haps = pattern.queryArc(t - eps, t + eps, { _cps: cps });
|
||||||
|
// Only keep haps coming from `midikeys`
|
||||||
|
const kbHaps = haps.filter((hap) => hap.value?.midikey?.startsWith(`${input}_`));
|
||||||
|
const ctxNow = getAudioContext().currentTime;
|
||||||
|
if (!kbHaps.length) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
kbHaps.forEach((hap) => {
|
||||||
|
if (!hap.hasOnset()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const t = ctxNow + (hap.whole.begin - now) / cps;
|
||||||
|
const duration = hap.duration / cps;
|
||||||
|
trigger(hap, t - ctxNow, duration, cps, t);
|
||||||
|
});
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
export async function midikeys(input) {
|
export async function midikeys(input) {
|
||||||
const device = await _initialize(input);
|
const device = await _initialize(input);
|
||||||
if (!kHaps[input]) {
|
if (!kHaps[input]) {
|
||||||
|
|
@ -584,11 +624,14 @@ export async function midikeys(input) {
|
||||||
kListeners[input] = (e) => {
|
kListeners[input] = (e) => {
|
||||||
const { dataBytes, message } = e;
|
const { dataBytes, message } = e;
|
||||||
const [note, velocity] = dataBytes;
|
const [note, velocity] = dataBytes;
|
||||||
const noteoff = message.command === 8;
|
const noteon = message.command === 9;
|
||||||
|
const noteoff = message.command === 8 || (noteon && velocity === 0);
|
||||||
const key = `${input}_${note}`;
|
const key = `${input}_${note}`;
|
||||||
const cps = getCps() ?? 0.5;
|
const cps = getCps() ?? 0.5;
|
||||||
const latencySeconds = 0.06; // slight delay so it's not too late for cyclist to catch
|
const triggerAvailable = !!(getPattern() && getTriggerFunc());
|
||||||
const t = getTime() + latencySeconds * cps;
|
const latencySeconds = triggerAvailable ? 0.01 : 0.06; // avoid missing notes due to cyclist / trigger latency
|
||||||
|
const now = getTime();
|
||||||
|
const t = now + latencySeconds * cps;
|
||||||
const span = new TimeSpan(t, t);
|
const span = new TimeSpan(t, t);
|
||||||
let value = { midikey: key };
|
let value = { midikey: key };
|
||||||
if (noteoff) {
|
if (noteoff) {
|
||||||
|
|
@ -609,6 +652,14 @@ export async function midikeys(input) {
|
||||||
value = { ...value, note: Math.round(note), velocity: velocity / 127 };
|
value = { ...value, note: Math.round(note), velocity: velocity / 127 };
|
||||||
}
|
}
|
||||||
kHaps[input].push(new Hap(span, span, value, {}));
|
kHaps[input].push(new Hap(span, span, value, {}));
|
||||||
|
if (!noteoff && triggerAvailable) {
|
||||||
|
// If we have access to a trigger function, we call it to immediately
|
||||||
|
// dispatch to the audio engine, rather than waiting for cyclist to catch these haps
|
||||||
|
const triggered = triggerKbNow(input, cps, now, latencySeconds * cps);
|
||||||
|
if (triggered) {
|
||||||
|
kHaps[input] = [];
|
||||||
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
device.addListener('midimessage', kListeners[input]);
|
device.addListener('midimessage', kListeners[input]);
|
||||||
const kb = (noteLength = 0.5) => {
|
const kb = (noteLength = 0.5) => {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue