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

preview outputs should be stereo

Browse source
This commit is contained in:
Jade Rowland 2023-11-23 12:43:51 -05:00
parent e419733716
commit 3fd5fdf1ee
4 changed files with 40 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

21
packages/superdough/superdough.mjs
View file

@ -23,6 +23,13 @@ export function registerSound(key, onTrigger, data = {}) {
export function getSound(s) {
return soundMap.get()[s];
}
// sounds with only one active channel will get upmixed to two, stereo sounds should remain unaffected
// There might be a better way to do this
export const upMixToStereo = (ctx, node) => {
const stereo = new StereoPannerNode(ctx);
node.connect(stereo);
return stereo;
};
export const resetLoadedSounds = () => soundMap.set({});
@ -117,14 +124,16 @@ const maxfeedback = 0.98;
const connectToOutputs = (input, channels = [0, 1]) => {
const outputs = getDestinations(channels);
const ctx = getAudioContext();
const center = new StereoPannerNode(ctx);
input.connect(center);
//This upmix can be avoided if correct channel counts are set throughout the app,
//could theoretically support surround sound audio files if that work was done
const stereo = upMixToStereo(ctx, input);
const splitter = new ChannelSplitterNode(ctx, {
numberOfOutputs: input.channelCount,
numberOfOutputs: stereo.channelCount,
});
center.connect(splitter);
stereo.connect(splitter);
outputs.forEach((output, i) => {
splitter.connect(output, i % input.channelCount, 0);
splitter.connect(output, i % stereo.channelCount, 0);
});
};
@ -334,6 +343,8 @@ export const superdough = async (value, deadline, hapDuration) => {
compressorRelease,
} = value;
channels = Array.isArray(channels) ? channels : [channels];
gain *= velocity; // legacy fix for velocity
let toDisconnect = []; // audio nodes that will be disconnected when the source has ended
const onended = () => {

6
packages/superdough/synth.mjs
View file

@ -71,8 +71,7 @@ export function waveformN(partials, type) {
const real = new Float32Array(partials + 1);
const imag = new Float32Array(partials + 1);
const ac = getAudioContext();
const osc = ac.createOscillator();
const osc = new OscillatorNode(ac, { channelCount: 1, channelCountMode: 'explicit' });
const terms = {
sawtooth: (n) => [0, -1 / n],
square: (n) => [0, n % 2 === 0 ? 0 : 1 / n],
@ -125,7 +124,8 @@ export function getOscillator(
let o;
// If no partials are given, use stock waveforms
if (!partials || s === 'sine') {
o = getAudioContext().createOscillator();
o = new OscillatorNode(ac, { channelCount: 1, channelCountMode: 'explicit' });
console.log(o);
o.type = s || 'triangle';
}
// generate custom waveform if partials are given