From 5bbdc6f91ab2df2913afb9eae403bd5ac73da1fc Mon Sep 17 00:00:00 2001 From: Pierre Alexandre Tremblay Date: Sun, 16 Sep 2018 12:34:15 +0100 Subject: [PATCH] now all test files have relative path (one needs to make a link/copy of fluid_decompositon/AudioFiles in the top level of release-packaging --- src/FluidBufCompose/tests.scd | 4 ++-- src/FluidBufExperiements/tests.scd | 9 ++++----- src/FluidBufHPSS/tests.scd | 2 +- src/FluidBufNMF/tests.scd | 16 +++------------- src/FluidBufSines/tests.scd | 2 +- src/FluidBufTransientSlice/tests.scd | 4 ++-- src/FluidBufTransients/tests.scd | 2 +- src/FluidHPSS/test.scd | 2 +- src/FluidSines/test.scd | 2 +- src/FluidTransientSlice/test.scd | 6 ++---- src/FluidTransients/test.scd | 2 +- 11 files changed, 19 insertions(+), 32 deletions(-) diff --git a/src/FluidBufCompose/tests.scd b/src/FluidBufCompose/tests.scd index a8733dc..a657c88 100644 --- a/src/FluidBufCompose/tests.scd +++ b/src/FluidBufCompose/tests.scd @@ -3,8 +3,8 @@ s.reboot // test for efficiency ( -b = Buffer.read(s,"/Users/pa/Documents/documents@hudd/research/projects/fluid corpus navigation/research/fluid_decomposition/AudioFiles/Tremblay-AaS-SynthTwoVoices-M.wav"); -c = Buffer.read(s,"/Users/pa/Documents/documents@hudd/research/projects/fluid corpus navigation/research/fluid_decomposition/AudioFiles/Tremblay-SA-UprightPianoPedalWide.wav"); +b = Buffer.read(s,"../../release-packaging/AudioFiles/Tremblay-AaS-SynthTwoVoices-M.wav".resolveRelative); +c = Buffer.read(s,"../../release-packaging/AudioFiles/Tremblay-SA-UprightPianoPedalWide.wav".resolveRelative); d = Buffer.new(s); ) diff --git a/src/FluidBufExperiements/tests.scd b/src/FluidBufExperiements/tests.scd index e6f5ab6..594cc18 100644 --- a/src/FluidBufExperiements/tests.scd +++ b/src/FluidBufExperiements/tests.scd @@ -2,10 +2,9 @@ s.reboot //Quickie test of buffer allocation working //Read a sound file -a = Buffer.read(s,"/Users/owen/Desktop/denoise_stn/sources/01-mix.wav"); -//Pass buffer to this, along with a rank. It will allocate a new buffer, +a = Buffer.read(s,"../../release-packaging/AudioFiles/Tremblay-AaS-SynthTwoVoices-M.wav".resolveRelative); //size it appropriately (in our server code) and return the new object -f = FDBufferExperiments.allocMatch(s,a,rank:5); +f = FluidBufExperiments.allocMatch(s,a,rank:5); //Make sure everything is kosher: a.query f.query @@ -16,10 +15,10 @@ s.reboot //Quickie test of buffer allocation working //Read a sound file -a = Buffer.read(s,"/Users/owen/Desktop/denoise_stn/sources/01-mix.wav"); +a = Buffer.read(s,"../../release-packaging/AudioFiles/Tremblay-AaS-SynthTwoVoices-M.wav".resolveRelative); //Pass buffer to this, along with a rank. It will allocate a new buffer, //size it appropriately (in our server code) and return the new object -f = FDBufferExperiments.allocMatchAsync(s,a,rank:5); +f = FluidBufExperiments.allocMatchAsync(s,a,rank:5); //Make sure everything is kosher: a.query f.query \ No newline at end of file diff --git a/src/FluidBufHPSS/tests.scd b/src/FluidBufHPSS/tests.scd index 04fd9d2..be42567 100644 --- a/src/FluidBufHPSS/tests.scd +++ b/src/FluidBufHPSS/tests.scd @@ -3,7 +3,7 @@ s.reboot // test for efficiency ( -b = Buffer.read(s,"/Users/pa/Documents/documents@hudd/research/projects/fluid corpus navigation/research/fluid_decomposition/AudioFiles/Tremblay-AaS-SynthTwoVoices-M.wav"); +b = Buffer.read(s,"../../release-packaging/AudioFiles/Tremblay-AaS-SynthTwoVoices-M.wav".resolveRelative); c = Buffer.new(s); d = Buffer.new(s); ) diff --git a/src/FluidBufNMF/tests.scd b/src/FluidBufNMF/tests.scd index 8a096db..8a8f769 100644 --- a/src/FluidBufNMF/tests.scd +++ b/src/FluidBufNMF/tests.scd @@ -3,7 +3,7 @@ s.reboot // test for efficiency ( -b = Buffer.read(s,"/Users/pa/Documents/documents@hudd/research/projects/fluid corpus navigation/research/archives-2017-18/denoise_stn/sources/01-mix.wav"); +b = Buffer.read(s,"../../release-packaging/AudioFiles/Tremblay-AaS-SynthTwoVoices-M.wav".resolveRelative); c = Buffer.new(s); x = Buffer.new(s); y = Buffer.new(s); @@ -91,8 +91,8 @@ Buffer.freeAll(s) ( Routine{ - b = Buffer.read(s,"/Users/pa/Documents/documents@hudd/research/projects/fluid corpus navigation/research/fluid_decomposition/AudioFiles/Tremblay-AaS-SynthTwoVoices-M.wav"); - c = Buffer.read(s,"/Users/pa/Documents/documents@hudd/research/projects/fluid corpus navigation/research/fluid_decomposition/AudioFiles/Tremblay-AaS-AcousticStrums-M.wav"); + b = Buffer.read(s,"../../release-packaging/AudioFiles/Tremblay-AaS-SynthTwoVoices-M.wav".resolveRelative); + c = Buffer.read(s,"../../release-packaging/AudioFiles/Tremblay-AaS-AcousticStrums-M.wav".resolveRelative); d = Buffer.new(s); e = Buffer.new(s); x = Buffer.new(s); @@ -129,16 +129,6 @@ y.query {Splay.ar(PlayBuf.ar(10,e.bufnum,doneAction:2))}.play //test process on a segment -Buffer.freeAll(s) - -( -d = Buffer.read(s,"/Users/pa/Desktop/verystereo.wav"); -b = Buffer.new(s); -c = Buffer.new(s); -) - -b.play - ( Routine{ t = Main.elapsedTime; diff --git a/src/FluidBufSines/tests.scd b/src/FluidBufSines/tests.scd index 69058da..51e47c4 100644 --- a/src/FluidBufSines/tests.scd +++ b/src/FluidBufSines/tests.scd @@ -3,7 +3,7 @@ s.reboot // test for efficiency ( -b = Buffer.read(s,"/Users/pa/Documents/documents@hudd/research/projects/fluid corpus navigation/research/fluid_decomposition/AudioFiles/Tremblay-AaS-SynthTwoVoices-M.wav"); +b = Buffer.read(s,"../../release-packaging/AudioFiles/Tremblay-AaS-SynthTwoVoices-M.wav".resolveRelative); c = Buffer.new(s); d = Buffer.new(s); ) diff --git a/src/FluidBufTransientSlice/tests.scd b/src/FluidBufTransientSlice/tests.scd index 0e9f630..a934ca0 100644 --- a/src/FluidBufTransientSlice/tests.scd +++ b/src/FluidBufTransientSlice/tests.scd @@ -3,7 +3,7 @@ s.reboot // test for efficiency ( -b = Buffer.read(s,"/Users/pa/Documents/documents@hudd/research/projects/fluid corpus navigation/research/fluid_decomposition/AudioFiles/Tremblay-AaS-SynthTwoVoices-M.wav"); +b = Buffer.read(s,"../../release-packaging/AudioFiles/Tremblay-AaS-SynthTwoVoices-M.wav".resolveRelative); c = Buffer.new(s); ) @@ -11,7 +11,7 @@ c = Buffer.new(s); // with basic params Routine{ t = Main.elapsedTime; - FluidBufTransientSlice.process(s,b.bufnum, transBufNum:c.bufnum, order:80); + FluidBufTransientSlice.process(s,b.bufnum, transBufNum:c.bufnum, order:80, debounce:4410); s.sync; (Main.elapsedTime - t).postln; }.play diff --git a/src/FluidBufTransients/tests.scd b/src/FluidBufTransients/tests.scd index a4da738..afefd3f 100644 --- a/src/FluidBufTransients/tests.scd +++ b/src/FluidBufTransients/tests.scd @@ -3,7 +3,7 @@ s.reboot // test for efficiency ( -b = Buffer.read(s,"/Users/pa/Documents/documents@hudd/research/projects/fluid corpus navigation/research/fluid_decomposition/AudioFiles/Tremblay-AaS-SynthTwoVoices-M.wav"); +b = Buffer.read(s,"../../release-packaging/AudioFiles/Tremblay-AaS-SynthTwoVoices-M.wav".resolveRelative); c = Buffer.new(s); d = Buffer.new(s); ) diff --git a/src/FluidHPSS/test.scd b/src/FluidHPSS/test.scd index 2fc4c71..c399b06 100644 --- a/src/FluidHPSS/test.scd +++ b/src/FluidHPSS/test.scd @@ -1,6 +1,6 @@ s.reboot; -b = Buffer.read(s,"/Users/pa/Documents/documents@hudd/research/projects/fluid corpus navigation/research/archives-2017-18/denoise_stn/sources/01-mix.wav"); +b = Buffer.read(s,"../../release-packaging/AudioFiles/Tremblay-AaS-SynthTwoVoices-M.wav".resolveRelative); b.play // basic param diff --git a/src/FluidSines/test.scd b/src/FluidSines/test.scd index 7d4236f..dfaffef 100644 --- a/src/FluidSines/test.scd +++ b/src/FluidSines/test.scd @@ -1,6 +1,6 @@ s.reboot; -b = Buffer.read(s,"/Users/pa/Documents/documents@hudd/research/projects/fluid corpus navigation/research/archives-2017-18/denoise_stn/sources/01-mix.wav"); +b = Buffer.read(s,"../../release-packaging/AudioFiles/Tremblay-AaS-SynthTwoVoices-M.wav".resolveRelative); b.play // basic param diff --git a/src/FluidTransientSlice/test.scd b/src/FluidTransientSlice/test.scd index 84e8f8c..2c69e49 100644 --- a/src/FluidTransientSlice/test.scd +++ b/src/FluidTransientSlice/test.scd @@ -1,11 +1,9 @@ s.reboot; -b = Buffer.read(s,"/Users/pa/Documents/documents@hudd/research/projects/fluid corpus navigation/research/archives-2017-18/denoise_stn/sources/01-mix.wav"); +b = Buffer.read(s,"../../release-packaging/AudioFiles/Tremblay-AaS-SynthTwoVoices-M.wav".resolveRelative); // basic param x = {FluidTransients.ar(PlayBuf.ar(1,b.bufnum,loop:1))}.play // sexier params -x = {FluidTransients.ar(PlayBuf.ar(1,b.bufnum,loop:1))}.play //change to something sensible - -// add null test \ No newline at end of file +x = {FluidTransients.ar(PlayBuf.ar(1,b.bufnum,loop:1))}.play //change to something sensible \ No newline at end of file diff --git a/src/FluidTransients/test.scd b/src/FluidTransients/test.scd index 431ba55..3180b64 100644 --- a/src/FluidTransients/test.scd +++ b/src/FluidTransients/test.scd @@ -1,6 +1,6 @@ s.reboot; -b = Buffer.read(s,"/Users/pa/Documents/documents@hudd/research/projects/fluid corpus navigation/research/archives-2017-18/denoise_stn/sources/01-mix.wav"); +b = Buffer.read(s,"../../release-packaging/AudioFiles/Tremblay-AaS-SynthTwoVoices-M.wav".resolveRelative); // basic param {FluidTransients.ar(PlayBuf.ar(1,b.bufnum,loop:1))}.play