mirror of
https://codeberg.org/uzu/strudel
synced 2026-07-21 20:55:12 -04:00
Add warning when midimap overrides existing Strudel API
This commit is contained in:
@@ -1755,6 +1755,23 @@ export const { miditouch } = registerControl('miditouch');
|
||||
// TODO: what is this?
|
||||
export const { polyTouch } = registerControl('polyTouch');
|
||||
|
||||
/**
|
||||
* Checks if a control name exists in the controlAlias map.
|
||||
* @name hasControlName
|
||||
* @param {string} alias The control name to check
|
||||
* @returns {boolean} True if the control name exists, false otherwise
|
||||
*/
|
||||
export const hasControlName = (alias) => {
|
||||
// Check if the name exists as a key (alias) or value (main control name)
|
||||
return controlAlias.has(alias) || Array.from(controlAlias.values()).includes(alias);
|
||||
};
|
||||
|
||||
/**
|
||||
* Gets the control name from the controlAlias map.
|
||||
* @name getControlName
|
||||
* @param {string} alias The control name to get
|
||||
* @returns {string} The control name
|
||||
*/
|
||||
export const getControlName = (alias) => {
|
||||
if (controlAlias.has(alias)) {
|
||||
return controlAlias.get(alias);
|
||||
|
||||
+29
-9
@@ -6,7 +6,7 @@ This program is free software: you can redistribute it and/or modify it under th
|
||||
|
||||
import * as _WebMidi from 'webmidi';
|
||||
import { Pattern, getEventOffsetMs, isPattern, logger, ref } from '@strudel/core';
|
||||
import { noteToMidi, getControlName, registerControl } from '@strudel/core';
|
||||
import { noteToMidi, hasControlName, getControlName, registerControl } from '@strudel/core';
|
||||
import { Note } from 'webmidi';
|
||||
|
||||
// if you use WebMidi from outside of this package, make sure to import that instance:
|
||||
@@ -105,16 +105,27 @@ function unifyMapping(mapping) {
|
||||
mapping = { ccn: mapping };
|
||||
}
|
||||
|
||||
// Get the non-aliased control name from the key
|
||||
const controlName = getControlName(key);
|
||||
|
||||
// Register the control in the midicontrolMap if it doesn't exist in
|
||||
// Check if the key or controlName already exists in the controlAlias map
|
||||
if (hasControlName(key) || hasControlName(controlName)) {
|
||||
// Show warning and carry on.
|
||||
logger(`[midimap] '[${key}, ${controlName}]' overwrites a Strudel API.`);
|
||||
|
||||
// Throw error to stop the music
|
||||
//throw new Error(`[midimap] '${key}' overwrites a Strudel API.`);
|
||||
}
|
||||
|
||||
// Register the control in the midicontrolMap if it doesn't exist
|
||||
if (!midicontrolMap.has(controlName)) {
|
||||
try {
|
||||
registerControl(controlName);
|
||||
} catch (err) {
|
||||
logger.error(`Failed to register control '${controlName}': ${err.message}`);
|
||||
throw err;
|
||||
throw new Error(`[midimap] Failed to register midimap control '${controlName}': ${err.message}`);
|
||||
}
|
||||
} else {
|
||||
logger(`[midimap] '${controlName}' already registered as a midimap control. Skipping registration.`);
|
||||
}
|
||||
return [controlName, mapping];
|
||||
}),
|
||||
@@ -175,7 +186,14 @@ export async function midimaps(map) {
|
||||
map = await loadCache[map];
|
||||
}
|
||||
if (typeof map === 'object') {
|
||||
Object.entries(map).forEach(([name, mapping]) => midicontrolMap.set(name, unifyMapping(mapping)));
|
||||
Object.entries(map).forEach(([name, mapping]) => {
|
||||
try {
|
||||
midicontrolMap.set(name, unifyMapping(mapping));
|
||||
} catch (err) {
|
||||
logger(`[midi] Error setting midimap '${name}': ${err.message}`);
|
||||
throw err;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -337,18 +355,18 @@ Pattern.prototype.midi = function (midiport, options = {}) {
|
||||
const device = getDevice(midiConfig.midiport, outputs);
|
||||
const otherOutputs = outputs.filter((o) => o.name !== device.name);
|
||||
logger(
|
||||
`Midi enabled! Using "${device.name}". ${
|
||||
`[midi] Midi enabled! Using "${device.name}". ${
|
||||
otherOutputs?.length ? `Also available: ${getMidiDeviceNamesString(otherOutputs)}` : ''
|
||||
}`,
|
||||
);
|
||||
},
|
||||
onDisconnected: ({ outputs }) =>
|
||||
logger(`Midi device disconnected! Available: ${getMidiDeviceNamesString(outputs)}`),
|
||||
logger(`[midi] Midi device disconnected! Available: ${getMidiDeviceNamesString(outputs)}`),
|
||||
});
|
||||
|
||||
return this.onTrigger((time_deprecate, hap, currentTime, cps, targetTime) => {
|
||||
if (!WebMidi.enabled) {
|
||||
logger('Midi not enabled');
|
||||
logger('[midi] Midi not enabled');
|
||||
return;
|
||||
}
|
||||
hap.ensureObjectValue();
|
||||
@@ -396,7 +414,9 @@ Pattern.prototype.midi = function (midiport, options = {}) {
|
||||
ccs.forEach(({ ccn, ccv }) => sendCC(ccn, ccv, device, midichan, timeOffsetString));
|
||||
} else if (midimap !== 'default') {
|
||||
// Add warning when a non-existent midimap is specified
|
||||
logger(`[midi] midimap "${midimap}" not found! Available maps: ${[...midicontrolMap.keys()].join(', ')}`);
|
||||
throw new Error(
|
||||
`[midimap] midimap "${midimap}" not found! Available maps: ${[...midicontrolMap.keys()].join(', ')}`,
|
||||
);
|
||||
}
|
||||
|
||||
// Handle note
|
||||
|
||||
Reference in New Issue
Block a user