elias/strudel-docker
1
0
Fork 0
mirror of https://github.com/eliasstepanik/strudel-docker.git synced 2026-01-11 13:48:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

add helper hap.ensureObjectValue

Browse Source
This commit is contained in:
Felix Roos 2023-02-24 10:15:06 +01:00
parent c8f8f02a46
commit 6283273d81
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/core/hap.mjs
View File

@ -126,6 +126,19 @@ export class Hap {
setContext(context) { setContext(context) {
return new Hap(this.whole, this.part, this.value, context); return new Hap(this.whole, this.part, this.value, context);
} }
ensureObjectValue() {
/* if (isNote(hap.value)) {
// supports primitive hap values that look like notes
hap.value = { note: hap.value };
} */
if (typeof this.value !== 'object') {
throw new Error(
`expected hap.value to be an object, but got "${this.value}". Hint: append .note() or .s() to the end`,
'error',
);
}
}
} }
export default Hap; export default Hap;

4
packages/csound/index.mjs
View File

@ -28,9 +28,7 @@ export const csound = register('csound', (instrument, pat) => {
logger('[csound] not loaded yet', 'warning'); logger('[csound] not loaded yet', 'warning');
return; return;
} }
if (typeof hap.value !== 'object') { hap.ensureObjectValue();
throw new Error('csound only support objects as hap values');
}
let { gain = 0.8 } = hap.value; let { gain = 0.8 } = hap.value;
gain *= 0.2; gain *= 0.2;

1
packages/osc/osc.mjs
View File

@ -47,6 +47,7 @@ let startedAt = -1;
*/ */
Pattern.prototype.osc = function () { Pattern.prototype.osc = function () {
return this.onTrigger(async (time, hap, currentTime, cps = 1) => { return this.onTrigger(async (time, hap, currentTime, cps = 1) => {
hap.ensureObjectValue();
const osc = await connect(); const osc = await connect();
const cycle = hap.wholeOrPart().begin.valueOf(); const cycle = hap.wholeOrPart().begin.valueOf();
const delta = hap.duration.valueOf(); const delta = hap.duration.valueOf();

18
packages/webaudio/webaudio.mjs
View File

@ -193,21 +193,9 @@ function effectSend(input, effect, wet) {
// export const webaudioOutput = async (t, hap, ct, cps) => { // export const webaudioOutput = async (t, hap, ct, cps) => {
export const webaudioOutput = async (hap, deadline, hapDuration) => { export const webaudioOutput = async (hap, deadline, hapDuration) => {
const ac = getAudioContext(); const ac = getAudioContext();
/* if (isNote(hap.value)) { hap.ensureObjectValue();
// supports primitive hap values that look like notes
hap.value = { note: hap.value }; // calculate absolute time
} */
if (typeof hap.value !== 'object') {
logger(
`hap.value "${hap.value}" is not supported by webaudio output. Hint: append .note() or .s() to the end`,
'error',
);
/* throw new Error(
`hap.value "${hap.value}"" is not supported by webaudio output. Hint: append .note() or .s() to the end`,
); */
return;
}
// calculate correct time (tone.js workaround)
let t = ac.currentTime + deadline; let t = ac.currentTime + deadline;
// destructure value // destructure value
let { let {