diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs index 214b4d11..90f0d369 100644 --- a/packages/superdough/superdough.mjs +++ b/packages/superdough/superdough.mjs @@ -23,9 +23,9 @@ export function setMaxPolyphony(polyphony) { maxPolyphony = parseInt(polyphony) ?? DEFAULT_MAX_POLYPHONY; } -let multiChannelOrbits = false +let multiChannelOrbits = false; export function setMultiChannelOrbits(bool) { - multiChannelOrbits = (bool == true); + multiChannelOrbits = bool == true; } export const soundMap = map(); @@ -201,8 +201,15 @@ function loadWorklets() { // this function should be called on first user interaction (to avoid console warning) export async function initAudio(options = {}) { - const { disableWorklets = false, maxPolyphony, audioDeviceName = DEFAULT_AUDIO_DEVICE_NAME, multiChannelOrbits = false } = options; + const { + disableWorklets = false, + maxPolyphony, + audioDeviceName = DEFAULT_AUDIO_DEVICE_NAME, + multiChannelOrbits = false, + } = options; + setMaxPolyphony(maxPolyphony); + setMultiChannelOrbits(multiChannelOrbits); if (typeof window === 'undefined') { return; } @@ -496,7 +503,7 @@ export const superdough = async (value, t, hapDuration) => { bpsustain, bprelease, bandq = getDefaultValue('bandq'), - + //phaser phaserrate: phaser, phaserdepth = getDefaultValue('phaserdepth'), @@ -532,8 +539,14 @@ export const superdough = async (value, t, hapDuration) => { compressorRelease, } = value; - const orbitChannels = multiChannelOrbits ? [(orbit * 2) - 1, orbit * 2] : getDefaultValue('channels') - const channels = value.channels ?? orbitChannels; + //music programs/audio gear usually increments inputs/outputs from 1, we need to subtract 1 from the input because the webaudio API channels start at 0 + const orbitChannels = ( + multiChannelOrbits && orbit > 0 ? [orbit * 2 - 1, orbit * 2] : getDefaultValue('channels') + ).map((ch) => ch - 1); + const channels = + value.channels != null + ? (Array.isArray(value.channels) ? value.channels : [value.channels]).map((ch) => ch - 1) + : orbitChannels; gain = applyGainCurve(nanFallback(gain, 1)); postgain = applyGainCurve(postgain); @@ -556,9 +569,6 @@ export const superdough = async (value, t, hapDuration) => { activeSoundSources.delete(chainID); } - //music programs/audio gear usually increments inputs/outputs from 1, so imitate that behavior - channels = (Array.isArray(channels) ? channels : [channels]).map((ch) => ch - 1); - let audioNodes = []; if (bank && s) { diff --git a/website/src/repl/components/panel/SettingsTab.jsx b/website/src/repl/components/panel/SettingsTab.jsx index c2faf07f..dd372555 100644 --- a/website/src/repl/components/panel/SettingsTab.jsx +++ b/website/src/repl/components/panel/SettingsTab.jsx @@ -6,7 +6,7 @@ import { ButtonGroup } from './Forms.jsx'; import { AudioDeviceSelector } from './AudioDeviceSelector.jsx'; import { AudioEngineTargetSelector } from './AudioEngineTargetSelector.jsx'; import { confirmDialog } from '../../util.mjs'; -import { DEFAULT_MAX_POLYPHONY, setMaxPolyphony } from '@strudel/webaudio'; +import { DEFAULT_MAX_POLYPHONY, setMaxPolyphony, setMultiChannelOrbits } from '@strudel/webaudio'; function Checkbox({ label, value, onChange, disabled = false }) { return ( @@ -108,6 +108,7 @@ export function SettingsTab({ started }) { audioEngineTarget, togglePanelTrigger, maxPolyphony, + multiChannelOrbits, } = useSettings(); const shouldAlwaysSync = isUdels(); const canChangeAudioDevice = AudioContext.prototype.setSinkId != null; @@ -162,6 +163,17 @@ export function SettingsTab({ started }) { value={maxPolyphony ?? ''} /> + + { + const val = cbEvent.target.checked; + settingsMap.setKey('multiChannelOrbits', val); + setMultiChannelOrbits(val); + }} + value={multiChannelOrbits} + /> + settingsMap.setKey('theme', theme)} /> diff --git a/website/src/repl/useReplContext.jsx b/website/src/repl/useReplContext.jsx index f0895aaa..f88e5a6e 100644 --- a/website/src/repl/useReplContext.jsx +++ b/website/src/repl/useReplContext.jsx @@ -18,7 +18,7 @@ import { setVersionDefaultsFrom } from './util.mjs'; import { StrudelMirror, defaultSettings } from '@strudel/codemirror'; import { clearHydra } from '@strudel/hydra'; import { useCallback, useEffect, useRef, useState } from 'react'; -import { settingsMap, useSettings } from '../settings.mjs'; +import { parseBoolean, settingsMap, useSettings } from '../settings.mjs'; import { setActivePattern, setLatestCode, @@ -36,11 +36,15 @@ import './Repl.css'; import { setInterval, clearInterval } from 'worker-timers'; import { getMetadata } from '../metadata_parser'; -const { latestCode, maxPolyphony, audioDeviceName } = settingsMap.get(); +const { latestCode, maxPolyphony, audioDeviceName, multiChannelOrbits } = settingsMap.get(); let modulesLoading, presets, drawContext, clearCanvas, audioReady; if (typeof window !== 'undefined') { - audioReady = initAudioOnFirstClick({ maxPolyphony, audioDeviceName }); + audioReady = initAudioOnFirstClick({ + maxPolyphony, + audioDeviceName, + multiChannelOrbits: parseBoolean(multiChannelOrbits), + }); modulesLoading = loadModules(); presets = prebake(); drawContext = getDrawContext(); diff --git a/website/src/settings.mjs b/website/src/settings.mjs index 1b4ba33f..84b43314 100644 --- a/website/src/settings.mjs +++ b/website/src/settings.mjs @@ -38,6 +38,7 @@ export const defaultSettings = { isButtonRowHidden: false, isCSSAnimationDisabled: false, maxPolyphony: 128, + multiChannelOrbits: false, }; let search = null; @@ -50,7 +51,7 @@ const settings_key = `strudel-settings${instance > 0 ? instance : ''}`; export const settingsMap = persistentMap(settings_key, defaultSettings); -const parseBoolean = (booleanlike) => ([true, 'true'].includes(booleanlike) ? true : false); +export const parseBoolean = (booleanlike) => ([true, 'true'].includes(booleanlike) ? true : false); export function useSettings() { const state = useStore(settingsMap); @@ -81,6 +82,7 @@ export function useSettings() { isPanelPinned: parseBoolean(state.isPanelPinned), isPanelOpen: parseBoolean(state.isPanelOpen), userPatterns: userPatterns, + multiChannelOrbits: parseBoolean(state.multiChannelOrbits), }; }