diff --git a/fdNMF/tests.scd b/fdNMF/tests.scd index cc735ef..0ffa71d 100644 --- a/fdNMF/tests.scd +++ b/fdNMF/tests.scd @@ -17,7 +17,7 @@ y = Buffer.new(s); // without sources r = Routine{ t = Main.elapsedTime; - FDNMF.nmf(s,b,0,-1,0,-1,nil,x,0,y,0,5,100,0,~frame_size,~hop_size,~fft_size); + FDNMF.process(s,b,0,-1,0,-1,nil,x,0,y,0,5,100,0,~frame_size,~hop_size,~fft_size); s.sync; (Main.elapsedTime - t).postln; }.play @@ -27,7 +27,7 @@ r = Routine{ ( r = Routine{ t = Main.elapsedTime; - FDNMF.nmf(s,b, 0,-1,0,-1,c,nil,0,nil,0,5,100,0,~frame_size,~hop_size,~fft_size); + FDNMF.process(s,b, 0,-1,0,-1,c,nil,0,nil,0,5,100,0,~frame_size,~hop_size,~fft_size); s.sync; (Main.elapsedTime - t).postln; }.play @@ -89,10 +89,12 @@ y = Buffer.new(s); ~hop_size = 256; ) +b.play + ( r = Routine{ t = Main.elapsedTime; - FDNMF.nmf(s,b,0,-1,0,-1,c,x,0,y,0,5,100,0,~frame_size,~hop_size,~fft_size); + FDNMF.process(s,b,0,-1,0,-1,c,x,0,y,0,5,100,0,~frame_size,~hop_size,~fft_size); s.sync; (Main.elapsedTime - t).postln; }.play @@ -116,11 +118,11 @@ b.play ( r = Routine{ t = Main.elapsedTime; - FDNMF.nmf(s,b,44100,44100,0,1,c,rank:2); + FDNMF.process(s,b,44100,44100,0,1,c,rank:2); s.sync; (Main.elapsedTime - t).postln; t = Main.elapsedTime; - FDNMF.nmf(s,b,88200,44100,1,1,d,rank:2); + FDNMF.process(s,b,88200,44100,1,1,d,rank:2); s.sync; (Main.elapsedTime - t).postln; }.play diff --git a/release-packaging/fdNMF/HelpSource/Classes/FDNMF.schelp b/release-packaging/fdNMF/HelpSource/Classes/FDNMF.schelp index f88c6bd..be291fb 100644 --- a/release-packaging/fdNMF/HelpSource/Classes/FDNMF.schelp +++ b/release-packaging/fdNMF/HelpSource/Classes/FDNMF.schelp @@ -16,7 +16,7 @@ This was made possible thanks to the FluCoMa project (http://www.flucoma.org/) CLASSMETHODS:: -METHOD:: nmf +METHOD:: process This is the method that calls for the factorisation to be calculated on a given source buffer. ARGUMENT:: server diff --git a/release-packaging/fdNMF/classes/fdNMF.sc b/release-packaging/fdNMF/classes/fdNMF.sc index 347ee5f..c828e99 100644 --- a/release-packaging/fdNMF/classes/fdNMF.sc +++ b/release-packaging/fdNMF/classes/fdNMF.sc @@ -1,5 +1,5 @@ FDNMF { - *nmf { 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; + *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;