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

use midicmd instead of clock

Browse source
This commit is contained in:
Felix Roos 2023-09-27 22:10:21 +02:00
parent 68ab43b3ab
commit dea1c31701
2 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/core/controls.mjs
View file

@ -1066,7 +1066,7 @@ const generic_params = [
*/ */
['waveloss'], ['waveloss'],
// TODO: midi effects? // TODO: midi effects?
['clock'], ['midicmd'],
['dur'], ['dur'],
// ['modwheel'], // ['modwheel'],
['expression'], ['expression'],

21
packages/midi/midi.mjs
View file

@ -90,13 +90,6 @@ Pattern.prototype.midi = function (output) {
enableWebMidi({ enableWebMidi({
onEnabled: ({ outputs }) => { onEnabled: ({ outputs }) => {
const device = getDevice(output, outputs); const device = getDevice(output, outputs);
if (typeof window !== 'undefined') {
window.addEventListener('message', (e) => {
if (e.data === 'strudel-stop') {
device.sendStop();
}
});
}
const otherOutputs = outputs.filter((o) => o.name !== device.name); const otherOutputs = outputs.filter((o) => o.name !== device.name);
logger( logger(
`Midi enabled! Using "${device.name}". ${ `Midi enabled! Using "${device.name}". ${
@ -121,7 +114,7 @@ Pattern.prototype.midi = function (output) {
const timeOffsetString = `+${offset}`; const timeOffsetString = `+${offset}`;
// destructure value // destructure value
const { note, nrpnn, nrpv, ccn, ccv, midichan = 1, clock } = hap.value; const { note, nrpnn, nrpv, ccn, ccv, midichan = 1, midicmd } = hap.value;
const velocity = hap.context?.velocity ?? 0.9; // TODO: refactor velocity const velocity = hap.context?.velocity ?? 0.9; // TODO: refactor velocity
// note off messages will often a few ms arrive late, try to prevent glitching by subtracting from the duration length // note off messages will often a few ms arrive late, try to prevent glitching by subtracting from the duration length
@ -143,12 +136,14 @@ Pattern.prototype.midi = function (output) {
const scaled = Math.round(ccv * 127); const scaled = Math.round(ccv * 127);
device.sendControlChange(ccn, scaled, midichan, { time: timeOffsetString }); device.sendControlChange(ccn, scaled, midichan, { time: timeOffsetString });
} }
const begin = hap.whole.begin + 0; if (['clock', 'midiClock'].includes(midicmd)) {
if (begin === 0) {
device.sendStart({ time: timeOffsetString });
}
if (clock) {
device.sendClock({ time: timeOffsetString }); device.sendClock({ time: timeOffsetString });
} else if (['start'].includes(midicmd)) {
device.sendStart({ time: timeOffsetString });
} else if (['stop'].includes(midicmd)) {
device.sendStop({ time: timeOffsetString });
} else if (['continue'].includes(midicmd)) {
device.sendContinue({ time: timeOffsetString });
} }
}); });
}; };