From 205cc528a5f72a70f59b7d0dbaf650fbf749de36 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Wed, 12 Sep 2018 15:40:38 +0100 Subject: [PATCH] RenamoFest Part II: Updating Ugen plugin names, class and helpfiles for new naming conventions --- release-packaging/Classes/FluidBufCompose.sc | 2 +- release-packaging/Classes/FluidBufExperiments.sc | 2 +- release-packaging/Classes/FluidBufHPSS.sc | 2 +- release-packaging/Classes/FluidBufNMF.sc | 2 +- release-packaging/Classes/FluidBufSines.sc | 2 +- release-packaging/Classes/FluidBufTransients.sc | 2 +- release-packaging/Classes/FluidGain.sc | 2 +- release-packaging/Classes/FluidHPSS.sc | 2 +- release-packaging/Classes/FluidSTFTPass.sc | 2 +- release-packaging/Classes/FluidSines.sc | 2 +- .../HelpSource/Classes/FluidBufHPSS.schelp | 2 +- .../Classes/{FluidBufNMD.schelp => FluidBufNMF.schelp} | 2 +- .../HelpSource/Classes/FluidBufSines.schelp | 2 +- .../HelpSource/Classes/FluidBufTransients.schelp | 2 +- release-packaging/HelpSource/Classes/FluidGain.schelp | 8 ++++---- release-packaging/HelpSource/Classes/FluidHPSS.schelp | 2 +- .../HelpSource/Classes/FluidSTFTPass.schelp | 10 +++++----- release-packaging/HelpSource/Classes/FluidSines.schelp | 2 +- .../HelpSource/Classes/FluidTransients.schelp | 6 ++++++ src/FluidGain/FluidGain.cpp | 2 +- src/FluidHPSS/FluidHPSS.cpp | 2 +- src/FluidSTFTPass/FluidSTFTPass.cpp | 2 +- src/FluidSines/FluidSines.cpp | 5 +---- 23 files changed, 35 insertions(+), 32 deletions(-) rename release-packaging/HelpSource/Classes/{FluidBufNMD.schelp => FluidBufNMF.schelp} (99%) create mode 100644 release-packaging/HelpSource/Classes/FluidTransients.schelp diff --git a/release-packaging/Classes/FluidBufCompose.sc b/release-packaging/Classes/FluidBufCompose.sc index 357d7fa..9e71b0a 100644 --- a/release-packaging/Classes/FluidBufCompose.sc +++ b/release-packaging/Classes/FluidBufCompose.sc @@ -1,4 +1,4 @@ -FDCompose{ +FluidBufCompose{ *process { arg server, srcBufNumA, startAtA = 0, nFramesA = -1, startChanA = 0, nChansA = -1, srcGainA = 1, dstStartAtA = 0, dstStartChanA = 0, srcBufNumB, startAtB = 0, nFramesB = -1, startChanB = 0, nChansB = -1, srcGainB = 1, dstStartAtB = 0, dstStartChanB = 0, dstBufNum; if(srcBufNumA.isNil) {Error("Invalid Buffer").format(thisMethod.name, this.class.name).throw}; diff --git a/release-packaging/Classes/FluidBufExperiments.sc b/release-packaging/Classes/FluidBufExperiments.sc index 097c8e0..aed0c97 100644 --- a/release-packaging/Classes/FluidBufExperiments.sc +++ b/release-packaging/Classes/FluidBufExperiments.sc @@ -1,4 +1,4 @@ -FDBufferExperiments { +FluidBufExperiments { *allocMatch{|server, srcbuf, rank=1| var dstbuf,srcbufnum; diff --git a/release-packaging/Classes/FluidBufHPSS.sc b/release-packaging/Classes/FluidBufHPSS.sc index 9564fe3..6353b44 100644 --- a/release-packaging/Classes/FluidBufHPSS.sc +++ b/release-packaging/Classes/FluidBufHPSS.sc @@ -1,4 +1,4 @@ -FDHPSS{ +FluidBufHPSS{ *process { arg server, src, offsetframes = 0, numframes = -1, offsetchans = 0, numchans = -1, harmbuf, percbuf, psize = 31, hsize = 17, winsize = 4096, hopsize = 1024, fftsize = -1; server = server ? Server.default; diff --git a/release-packaging/Classes/FluidBufNMF.sc b/release-packaging/Classes/FluidBufNMF.sc index 6afd73d..9f43170 100644 --- a/release-packaging/Classes/FluidBufNMF.sc +++ b/release-packaging/Classes/FluidBufNMF.sc @@ -1,4 +1,4 @@ -FDNMF { +FluidBufNMF { *process { arg server, srcBufNum, startAt = 0, nFrames = -1, startChan = 0, nChans = -1, dstBufNum, dictBufNum, dictFlag = 0, actBufNum, actFlag = 0, rank = 1, iterations = 100, sortFlag = 0, windowSize = 1024, hopSize = 256, fftSize = -1, windowType = 0, randomSeed = -1; if(srcBufNum.isNil) { Error("Invalid buffer").format(thisMethod.name, this.class.name).throw}; diff --git a/release-packaging/Classes/FluidBufSines.sc b/release-packaging/Classes/FluidBufSines.sc index 5692ba8..6d1a003 100644 --- a/release-packaging/Classes/FluidBufSines.sc +++ b/release-packaging/Classes/FluidBufSines.sc @@ -1,4 +1,4 @@ -FDSines{ +FluidBufSines{ *process { arg server, src, offsetframes = 0, numframes = -1, offsetchans = 0, numchans = -1, sinebuf, resbuf, bandwidth = 76, threshold = 0.7, mintracklen = 15, magweight = 0.1, freqweight = 1, winsize = 4096, hopsize = 1024, fftsize = -1; server = server ? Server.default; diff --git a/release-packaging/Classes/FluidBufTransients.sc b/release-packaging/Classes/FluidBufTransients.sc index 0f70cea..a3f72c5 100644 --- a/release-packaging/Classes/FluidBufTransients.sc +++ b/release-packaging/Classes/FluidBufTransients.sc @@ -1,4 +1,4 @@ -FDTransients { +FluidBufTransients { *process { arg server, srcBufNum, startAt = 0, nFrames = -1, startChan = 0, nChans = -1, transBufNum, resBufNum, order = 200, blockSize = 2048, padding = 1024, skew = 0, threshFwd = 3, threshBack = 1.1, windowSize = 14, debounce = 25; if(srcBufNum.isNil) { Error("Invalid buffer").format(thisMethod.name, this.class.name).throw}; diff --git a/release-packaging/Classes/FluidGain.sc b/release-packaging/Classes/FluidGain.sc index 938ecf4..2d654f6 100644 --- a/release-packaging/Classes/FluidGain.sc +++ b/release-packaging/Classes/FluidGain.sc @@ -1,4 +1,4 @@ -FDGain : UGen { +FluidGain : UGen { *ar { arg in = 0, frameSize=64, gain=1.0; ^this.multiNew('audio', in.asAudioRateInput(this),frameSize, gain) } diff --git a/release-packaging/Classes/FluidHPSS.sc b/release-packaging/Classes/FluidHPSS.sc index 20dda1e..c0040fa 100644 --- a/release-packaging/Classes/FluidHPSS.sc +++ b/release-packaging/Classes/FluidHPSS.sc @@ -1,4 +1,4 @@ -FDRTHPSS : MultiOutUGen { +FluidHPSS : MultiOutUGen { *ar { arg in = 0, percussiveFilterSize = 17, harmonicFilterSize = 17, percussiveThreshold = 50, harmonicThreshold = 50, windowSize= 1024, hopSize= 256, fftSize= -1; ^this.multiNew('audio', in.asAudioRateInput(this),harmonicFilterSize,percussiveFilterSize,percussiveThreshold,harmonicThreshold,windowSize, hopSize, fftSize) } diff --git a/release-packaging/Classes/FluidSTFTPass.sc b/release-packaging/Classes/FluidSTFTPass.sc index 3b9d7ff..6b86f5e 100644 --- a/release-packaging/Classes/FluidSTFTPass.sc +++ b/release-packaging/Classes/FluidSTFTPass.sc @@ -1,4 +1,4 @@ -FDSTFTPass : UGen { +FluidSTFTPass : UGen { *ar { arg in = 0, windowSize= 1024, hopSize= 256, fftSize= -1; ^this.multiNew('audio', in.asAudioRateInput(this),windowSize, hopSize, fftSize) } diff --git a/release-packaging/Classes/FluidSines.sc b/release-packaging/Classes/FluidSines.sc index fe46599..ded6845 100644 --- a/release-packaging/Classes/FluidSines.sc +++ b/release-packaging/Classes/FluidSines.sc @@ -1,4 +1,4 @@ -FDRTSines : MultiOutUGen { +FluidSines : MultiOutUGen { *ar { arg in = 0, bandwidth = 76, threshold = 0.7, minTrackLen = 15, magnitudeWeight = 0.1, frequencyWeight = 1.0, windowSize= 2048, hopSize= 512, fftSize= 8192; ^this.multiNew('audio', in.asAudioRateInput(this), bandwidth, threshold, minTrackLen, magnitudeWeight,frequencyWeight ,windowSize, hopSize, fftSize) } diff --git a/release-packaging/HelpSource/Classes/FluidBufHPSS.schelp b/release-packaging/HelpSource/Classes/FluidBufHPSS.schelp index 72d24b6..2a18b0c 100644 --- a/release-packaging/HelpSource/Classes/FluidBufHPSS.schelp +++ b/release-packaging/HelpSource/Classes/FluidBufHPSS.schelp @@ -8,7 +8,7 @@ s.reboot -FDHPSS.process(s,b,0,1-1,0,-1,h,p,31,17) +FluidBufHPSS.process(s,b,0,1-1,0,-1,h,p,31,17) p.play; h.play; \ No newline at end of file diff --git a/release-packaging/HelpSource/Classes/FluidBufNMD.schelp b/release-packaging/HelpSource/Classes/FluidBufNMF.schelp similarity index 99% rename from release-packaging/HelpSource/Classes/FluidBufNMD.schelp rename to release-packaging/HelpSource/Classes/FluidBufNMF.schelp index a1e5841..e0249fe 100644 --- a/release-packaging/HelpSource/Classes/FluidBufNMD.schelp +++ b/release-packaging/HelpSource/Classes/FluidBufNMF.schelp @@ -1,4 +1,4 @@ -TITLE:: FDNMF +TITLE:: FluidBufNMF summary:: Non-Negative Matrix Factorisation on Spectral Frames categories:: Libraries>FluidDecomposition related:: Overviews/FluCoMa diff --git a/release-packaging/HelpSource/Classes/FluidBufSines.schelp b/release-packaging/HelpSource/Classes/FluidBufSines.schelp index d080c14..b6f1b99 100644 --- a/release-packaging/HelpSource/Classes/FluidBufSines.schelp +++ b/release-packaging/HelpSource/Classes/FluidBufSines.schelp @@ -9,7 +9,7 @@ s.reboot Buffer.new(s) -FDSines.process(s,b,0,1-1,0,-1,h,n,15,0.2) +FluidBufSines.process(s,b,0,1-1,0,-1,h,n,15,0.2) n.play; h.play; \ No newline at end of file diff --git a/release-packaging/HelpSource/Classes/FluidBufTransients.schelp b/release-packaging/HelpSource/Classes/FluidBufTransients.schelp index c2aa538..b65926f 100644 --- a/release-packaging/HelpSource/Classes/FluidBufTransients.schelp +++ b/release-packaging/HelpSource/Classes/FluidBufTransients.schelp @@ -1,4 +1,4 @@ -TITLE:: FDTransients +TITLE:: FluidBufTransients summary:: A Non-Real-Time Transient Extractor categories:: Libraries>FluidDecomposition related:: Overviews/FluCoMa diff --git a/release-packaging/HelpSource/Classes/FluidGain.schelp b/release-packaging/HelpSource/Classes/FluidGain.schelp index 39a292e..ebd48f4 100644 --- a/release-packaging/HelpSource/Classes/FluidGain.schelp +++ b/release-packaging/HelpSource/Classes/FluidGain.schelp @@ -1,4 +1,4 @@ -TITLE:: FDGain +TITLE:: FluidGain summary:: Real-Time Buffered Gain Changer categories:: UGens>Algebraic related::Classes/UnaryOpFunction @@ -26,13 +26,13 @@ returns:: EXAMPLES:: Summing with the inverse (gain of -1) with a delay of the latency gives us CPU-expensive silence. code:: - { var source = PinkNoise.ar(0.1); DelayN.ar(source,delaytime:1000/s.sampleRate) + FDGain.ar(source,1000,-1); }.play + { var source = PinkNoise.ar(0.1); DelayN.ar(source,delaytime:1000/s.sampleRate) + FluidGain.ar(source,1000,-1); }.play :: Varying the gain at audio rate. code:: - { FDGain.ar(PinkNoise.ar(0.1), gain:LFTri.ar(1)) }.play + { FluidGain.ar(PinkNoise.ar(0.1), gain:LFTri.ar(1)) }.play :: Varying the gain at comtrol rate, in beautiful stereo. code:: - { FDGain.ar(SinOsc.ar([222,333],mul:0.1), gain:LFTri.kr([0.5,0.7])) }.play + { FluidGain.ar(SinOsc.ar([222,333],mul:0.1), gain:LFTri.kr([0.5,0.7])) }.play :: diff --git a/release-packaging/HelpSource/Classes/FluidHPSS.schelp b/release-packaging/HelpSource/Classes/FluidHPSS.schelp index ad38ac1..442473f 100644 --- a/release-packaging/HelpSource/Classes/FluidHPSS.schelp +++ b/release-packaging/HelpSource/Classes/FluidHPSS.schelp @@ -1,3 +1,3 @@ s.reboot b = Buffer.cueSoundFile(s,"/Users/owen/Desktop/denoise_stn/sources/01-mix.wav",0,1) -x = {FDRTHPSS.ar(DiskIn.ar(1,b.bufnum,loop:1))}.play \ No newline at end of file +x = {FluidHPSS.ar(DiskIn.ar(1,b.bufnum,loop:1))}.play \ No newline at end of file diff --git a/release-packaging/HelpSource/Classes/FluidSTFTPass.schelp b/release-packaging/HelpSource/Classes/FluidSTFTPass.schelp index c980edb..897bda6 100644 --- a/release-packaging/HelpSource/Classes/FluidSTFTPass.schelp +++ b/release-packaging/HelpSource/Classes/FluidSTFTPass.schelp @@ -1,4 +1,4 @@ -TITLE:: FDSTFTPass +TITLE:: FluidBufSTFTPass summary:: Real-Time FFT/IFFT return trip. categories:: UGens>Algebraic related:: Classes/UnaryOpFunction @@ -32,17 +32,17 @@ EXAMPLES:: Summing with the inverse (gain of -1) with a delay of the latency gives us CPU-expensive silence. code:: - { var source = PinkNoise.ar(0.1); DelayN.ar(source, delaytime:1024/s.sampleRate, mul: -1) + FDSTFTPass.ar(source, 1024, 256, 1024); }.play + { var source = PinkNoise.ar(0.1); DelayN.ar(source, delaytime:1024/s.sampleRate, mul: -1) + FluidBufSTFTPass.ar(source, 1024, 256, 1024); }.play :: Larger, oversampled, FFT code:: - { FDSTFTPass.ar(PinkNoise.ar(0.1), 2048, 128, 8192) }.play + { FluidBufSTFTPass.ar(PinkNoise.ar(0.1), 2048, 128, 8192) }.play :: Stereo Input Tests. code:: - { FDSTFTPass.ar([SinOsc.ar(222,mul: 0.1), PinkNoise.ar(Decay.ar(Impulse.ar(0.666,mul: 0.2), 0.5))], fftSize:1024)}.play + { FluidBufSTFTPass.ar([SinOsc.ar(222,mul: 0.1), PinkNoise.ar(Decay.ar(Impulse.ar(0.666,mul: 0.2), 0.5))], fftSize:1024)}.play :: Stereo Parameter Tests. code:: - { FDSTFTPass.ar(SinOsc.ar(222,mul: 0.1), [1024,8192],256,8192)}.play + { FluidBufSTFTPass.ar(SinOsc.ar(222,mul: 0.1), [1024,8192],256,8192)}.play :: diff --git a/release-packaging/HelpSource/Classes/FluidSines.schelp b/release-packaging/HelpSource/Classes/FluidSines.schelp index 45e2088..db1bab5 100644 --- a/release-packaging/HelpSource/Classes/FluidSines.schelp +++ b/release-packaging/HelpSource/Classes/FluidSines.schelp @@ -1,4 +1,4 @@ s.reboot; b = Buffer.cueSoundFile(s,"/Users/owen/Box Sync/FluCoMa/Test files/SMS test files/Test Files/PAs 24 bit files/maxou-FR-a-k.wav.wav",0,1); b.query -x = {FDRTSines.ar(DiskIn.ar(1,b.bufnum))}.play; +x = {FluidSines.ar(DiskIn.ar(1,b.bufnum))}.play; diff --git a/release-packaging/HelpSource/Classes/FluidTransients.schelp b/release-packaging/HelpSource/Classes/FluidTransients.schelp new file mode 100644 index 0000000..1d4e182 --- /dev/null +++ b/release-packaging/HelpSource/Classes/FluidTransients.schelp @@ -0,0 +1,6 @@ +s.reboot; +b = Buffer.cueSoundFile(s,"/Users/owen/Desktop/denoise_stn/sources/01-mix.wav",0,1); + + +b.query +x = {FluidTransients.ar(DiskIn.ar(1,b.bufnum))}.play; diff --git a/src/FluidGain/FluidGain.cpp b/src/FluidGain/FluidGain.cpp index 5b59346..8464176 100644 --- a/src/FluidGain/FluidGain.cpp +++ b/src/FluidGain/FluidGain.cpp @@ -92,7 +92,7 @@ private: PluginLoad(BoringMixer2UGens) { ft = inTable; - registerUnit(ft, "FDGain"); + registerUnit(ft, "FluidGain"); } diff --git a/src/FluidHPSS/FluidHPSS.cpp b/src/FluidHPSS/FluidHPSS.cpp index 4c55983..6492360 100644 --- a/src/FluidHPSS/FluidHPSS.cpp +++ b/src/FluidHPSS/FluidHPSS.cpp @@ -116,7 +116,7 @@ namespace hpss{ PluginLoad(FluidSTFTUGen) { ft = inTable; - registerUnit(ft, "FDRTHPSS"); + registerUnit(ft, "FluidHPSS"); } diff --git a/src/FluidSTFTPass/FluidSTFTPass.cpp b/src/FluidSTFTPass/FluidSTFTPass.cpp index 0555530..7eb740b 100644 --- a/src/FluidSTFTPass/FluidSTFTPass.cpp +++ b/src/FluidSTFTPass/FluidSTFTPass.cpp @@ -85,7 +85,7 @@ private: PluginLoad(FluidSTFTUGen) { ft = inTable; - registerUnit(ft, "FDSTFTPass"); + registerUnit(ft, "FluidSTFTPass"); } diff --git a/src/FluidSines/FluidSines.cpp b/src/FluidSines/FluidSines.cpp index f263b1a..6ea48be 100644 --- a/src/FluidSines/FluidSines.cpp +++ b/src/FluidSines/FluidSines.cpp @@ -126,9 +126,6 @@ namespace stn{ PluginLoad(FluidSTFTUGen) { ft = inTable; - registerUnit(ft, "FDRTSines"); + registerUnit(ft, "FluidSines"); } - - -