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

Merge pull request #347 from tidalcycles/fix-midi

Browse Source 
fixes #346
This commit is contained in:
Felix Roos 2023-01-04 19:55:48 +01:00 committed by GitHub
commit 24d2b5b4bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
packages/midi/midi.mjs
View File

@ -11,10 +11,14 @@ import { getAudioContext } from '@strudel.cycles/webaudio';
// 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:
export const { WebMidi } = _WebMidi; export const { WebMidi } = _WebMidi;
function supportsMidi() {
return typeof navigator.requestMIDIAccess === 'function';
}
export function enableWebMidi(options = {}) { export function enableWebMidi(options = {}) {
const { onReady, onConnected, onDisconnected } = options; const { onReady, onConnected, onDisconnected } = options;
if (typeof navigator.requestMIDIAccess !== 'function') { if (!supportsMidi()) {
throw new Error('Your Browser does not support WebMIDI.'); throw new Error('Your Browser does not support WebMIDI.');
} }
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@ -42,23 +46,43 @@ export function enableWebMidi(options = {}) {
// const outputByName = (name: string) => WebMidi.getOutputByName(name); // const outputByName = (name: string) => WebMidi.getOutputByName(name);
const outputByName = (name) => WebMidi.getOutputByName(name); const outputByName = (name) => WebMidi.getOutputByName(name);
let midiReady;
// output?: string | number, outputs: typeof WebMidi.outputs
function getDevice(output, outputs) {
if (!outputs.length) {
throw new Error(`🔌 No MIDI devices found. Connect a device or enable IAC Driver.`);
}
if (typeof output === 'number') {
return outputs[output];
}
if (typeof output === 'string') {
return outputByName(output);
}
return outputs[0];
}
// Pattern.prototype.midi = function (output: string | number, channel = 1) { // Pattern.prototype.midi = function (output: string | number, channel = 1) {
Pattern.prototype.midi = async function (output, channel = 1) { Pattern.prototype.midi = function (output, channel = 1) {
await enableWebMidi({ if (!supportsMidi()) {
throw new Error(`🎹 WebMidi is not enabled. Supported Browsers: https://caniuse.com/?search=webmidi`);
}
/* await */ enableWebMidi({
onConnected: ({ outputs }) => onConnected: ({ outputs }) =>
logger(`Midi device connected! Available: ${outputs.map((o) => `'${o.name}'`).join(', ')}`), logger(`Midi device connected! Available: ${outputs.map((o) => `'${o.name}'`).join(', ')}`),
onDisconnected: ({ outputs }) => onDisconnected: ({ outputs }) =>
logger(`Midi device disconnected! Available: ${outputs.map((o) => `'${o.name}'`).join(', ')}`), logger(`Midi device disconnected! Available: ${outputs.map((o) => `'${o.name}'`).join(', ')}`),
onReady: ({ outputs }) => { onReady: ({ outputs }) => {
const chosenOutput = output ?? outputs[0]; const device = getDevice(output, outputs);
const otherOutputs = outputs const otherOutputs = outputs
.filter((o) => o.name !== chosenOutput.name) .filter((o) => o.name !== device.name)
.map((o) => `'${o.name}'`) .map((o) => `'${o.name}'`)
.join(' | '); .join(' | ');
logger(`Midi connected! Using "${chosenOutput.name}". ${otherOutputs ? `Also available: ${otherOutputs}` : ''}`); midiReady = true;
logger(`Midi connected! Using "${device.name}". ${otherOutputs ? `Also available: ${otherOutputs}` : ''}`);
}, },
}); });
if (isPattern(output?.constructor?.name)) { if (isPattern(output)) {
throw new Error( throw new Error(
`.midi does not accept Pattern input. Make sure to pass device name with single quotes. Example: .midi('${ `.midi does not accept Pattern input. Make sure to pass device name with single quotes. Example: .midi('${
WebMidi.outputs?.[0]?.name || 'IAC Driver Bus 1' WebMidi.outputs?.[0]?.name || 'IAC Driver Bus 1'
@ -71,20 +95,10 @@ Pattern.prototype.midi = async function (output, channel = 1) {
if (!isNote(note)) { if (!isNote(note)) {
throw new Error('not a note: ' + note); throw new Error('not a note: ' + note);
} }
if (!WebMidi.enabled) { if (!midiReady) {
throw new Error(`🎹 WebMidi is not enabled. Supported Browsers: https://caniuse.com/?search=webmidi`); return;
}
if (!WebMidi.outputs.length) {
throw new Error(`🔌 No MIDI devices found. Connect a device or enable IAC Driver.`);
}
let device;
if (typeof output === 'number') {
device = WebMidi.outputs[output];
} else if (typeof output === 'string') {
device = outputByName(output);
} else {
device = WebMidi.outputs[0];
} }
const device = getDevice(output, WebMidi.outputs);
if (!device) { if (!device) {
throw new Error( throw new Error(
`🔌 MIDI device '${output ? output : ''}' not found. Use one of ${WebMidi.outputs `🔌 MIDI device '${output ? output : ''}' not found. Use one of ${WebMidi.outputs