From 50027f1ca3c31c0b70102f80eb180f20c6671f7a Mon Sep 17 00:00:00 2001 From: Pierre Alexandre Tremblay Date: Sat, 8 Sep 2018 12:32:40 +0100 Subject: [PATCH] reformat of the fdNMF and fdTransient class defintion - the later has an error of not passing some parameters. --- release-packaging/fdNMF/classes/fdNMF.sc | 18 +++++++++--------- .../fdTransients/classes/fdTransients.sc | 16 +++++++++------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/release-packaging/fdNMF/classes/fdNMF.sc b/release-packaging/fdNMF/classes/fdNMF.sc index c828e99..84fe36a 100644 --- a/release-packaging/fdNMF/classes/fdNMF.sc +++ b/release-packaging/fdNMF/classes/fdNMF.sc @@ -1,16 +1,16 @@ FDNMF { *process { arg server, srcBuf, startAt = 0, nFrames = -1,startChan = 0,nChans = -1, dstBuf, dictBuf, dictFlag = 0, actBuf, actFlag = 0, rank = 1, iterations = 100, sortFlag = 0, windowSize = 1024, hopSize = 256, fftSize = -1, windowType = 0, randomSeed = -1; - server = server ? Server.default; + var dstBufNum,dictBufNum,actBufNum; if(srcBuf.bufnum.isNil) { Error("Invalid buffer").format(thisMethod.name, this.class.name).throw}; - server.sendMsg(\cmd, \BufNMF, - srcBuf.bufnum, startAt, nFrames, startChan, nChans, - if(dstBuf.isNil, -1, {dstBuf.bufnum}), - if(dictBuf.isNil, -1, {dictBuf.bufnum}), - dictFlag, - if(actBuf.isNil, -1, {actBuf.bufnum}), - actFlag, rank, iterations, windowSize, hopSize,fftSize); + server = server ? Server.default; + + dstBufNum = if(dstBuf.isNil, -1, {dstBuf.bufnum}); + dictBufNum = if(dictBuf.isNil, -1, {dictBuf.bufnum}); + actBufNum = if(actBuf.isNil, -1, {actBuf.bufnum}); + + server.sendMsg(\cmd, \BufNMF, srcBuf.bufnum, startAt, nFrames, startChan, nChans, dstBufNum, dictBufNum, dictFlag, actBufNum, actFlag, rank, iterations, windowSize, hopSize,fftSize); } -} +} \ No newline at end of file diff --git a/release-packaging/fdTransients/classes/fdTransients.sc b/release-packaging/fdTransients/classes/fdTransients.sc index 027e32b..7dba72f 100644 --- a/release-packaging/fdTransients/classes/fdTransients.sc +++ b/release-packaging/fdTransients/classes/fdTransients.sc @@ -1,14 +1,16 @@ FDTransients { - *process { arg server, srcBuf, offsetframes = 0, numframes = -1, offsetchans = 0, numchans = -1, transbuf, resbuf, order = 200, blocksize = 2048, padding = 1024, skew = 0, threshfwd = 3, threshback = 1.1, windowsize = 14, debounce = 25; - server = server ? Server.default; + *process { arg server, srcBuf, startAt = 0, nFrames = -1, startChan = 0, nChans = -1, transBuf, resBuf, order = 200, blockSize = 2048, padding = 1024, skew = 0, threshFwd = 3, threshBack = 1.1, windowSize = 14, debounce = 25; + + var transBufNum,resBufNum; if(srcBuf.bufnum.isNil) { Error("Invalid buffer").format(thisMethod.name, this.class.name).throw}; + server = server ? Server.default; + + transBufNum = if(transBuf.isNil, -1, {transBuf.bufnum}); + resBufNum = if(resBuf.isNil, -1, {resBuf.bufnum}); + server.sendMsg(\cmd, \BufTransient, - srcBuf.bufnum, offsetframes, numframes, offsetchans, numchans, - if(transbuf.isNil, -1, {transbuf.bufnum}), - if(resbuf.isNil, -1, {resbuf.bufnum}), - order,blocksize,padding,skew,threshback,windowsize,debounce - ); + srcBuf.bufnum, startAt, nFrames, startChan, nChans, transBufNum, resBufNum, order, blockSize, padding, skew, threshBack, windowSize, debounce); } }