From c32b58ca74ef80863dfd5df12d776ae917e57fb7 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Thu, 5 Dec 2019 10:49:16 +0100 Subject: [PATCH] AudioTransport: pass the right things --- release-packaging/Classes/FluidBufAudioTransport.sc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/release-packaging/Classes/FluidBufAudioTransport.sc b/release-packaging/Classes/FluidBufAudioTransport.sc index 1268adc..0d00f67 100644 --- a/release-packaging/Classes/FluidBufAudioTransport.sc +++ b/release-packaging/Classes/FluidBufAudioTransport.sc @@ -5,6 +5,7 @@ FluidBufAudioTransport : UGen{ *kr { |source1, startFrame1 = 0, numFrames1 = -1, startChan1 = 0, numChans1 = -1, source2, startFrame2 = 0, numFrames2 = -1, startChan2 = 0, numChans2 = -1, destination, interpolation=0.0, bandwidth=255, windowSize = 1024, hopSize = -1, fftSize = -1, doneAction = 0| var maxFFTSize = if (fftSize == -1) {windowSize.nextPowerOfTwo} {fftSize}; + var blocking = 0; source1.isNil.if {"FluidAudioTransport: Invalid source 1 buffer".throw}; source2.isNil.if {"FluidAudioTransport: Invalid source 2 buffer".throw}; @@ -16,7 +17,7 @@ FluidBufAudioTransport : UGen{ //NB For wrapped versions of NRT classes, we set the params for maxima to //whatever has been passed in language-side (e.g maxFFTSize still exists as a parameter for the server plugin, but makes less sense here: it just needs to be set to a legal value) - ^this.multiNew(\control, startFrame1, numFrames1, startChan1, numChans1, source2, startFrame1, numFrames1, startChan2, numChans2, destination, interpolation, bandwidth, windowSize, hopSize, fftSize, doneAction); + ^this.multiNew(\control, source1, startFrame1, numFrames1, startChan1, numChans1, source2, startFrame1, numFrames1, startChan2, numChans2, destination, interpolation, bandwidth, windowSize, hopSize, fftSize,maxFFTSize, doneAction,blocking); } @@ -39,7 +40,7 @@ FluidBufAudioTransport : UGen{ "WARNING: Server not running".postln; ^nil; }); - synth = { instance = FluidBufSines.kr(source1, startFrame1, numFrames1, startChan1, numChans1, source2, startFrame1, numFrames1, startChan2, numChans2, destination, interpolation, bandwidth, windowSize, hopSize, fftSize, doneAction:Done.freeSelf)}.play(server); + synth = { instance = FluidBufAudioTransport.kr(source1, startFrame1, numFrames1, startChan1, numChans1, source2, startFrame1, numFrames1, startChan2, numChans2, destination, interpolation, bandwidth, windowSize, hopSize, fftSize, doneAction:Done.freeSelf)}.play(server); forkIfNeeded{ synth.waitForFree; server.sync;