From c64f8eba3fad9b4f705033c3f935f168a883590e Mon Sep 17 00:00:00 2001 From: Pierre Alexandre Tremblay Date: Thu, 11 Jun 2020 20:05:43 +0100 Subject: [PATCH] fixing helper when no slices are return, and amended demo-dataset accordingly --- release-packaging/Classes/FluidCorpusBuilders.sc | 2 ++ .../Examples/dataset/demo-dataset-maker-utilities.scd | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/release-packaging/Classes/FluidCorpusBuilders.sc b/release-packaging/Classes/FluidCorpusBuilders.sc index 0c6bf3b..b6efec9 100644 --- a/release-packaging/Classes/FluidCorpusBuilders.sc +++ b/release-packaging/Classes/FluidCorpusBuilders.sc @@ -98,6 +98,8 @@ FluidSliceCorpus { }{ var dict = IdentityDictionary(); dict.putAll(v); + dict[\prefix] = k; + dict[\index] = 1; index.add((k ++ "-1").asSymbol->dict); }; if(jobs.size > 0){perf.value(tmpIndices)}{ tmpIndices.free }; diff --git a/release-packaging/Examples/dataset/demo-dataset-maker-utilities.scd b/release-packaging/Examples/dataset/demo-dataset-maker-utilities.scd index 16827b0..159483b 100644 --- a/release-packaging/Examples/dataset/demo-dataset-maker-utilities.scd +++ b/release-packaging/Examples/dataset/demo-dataset-maker-utilities.scd @@ -17,13 +17,14 @@ // here we instantiate a process of description and dataset writing, which will run each slice of the previous slice and write the entry. Note the chain of Done.kr triggers. ~extractor = FluidProcessSlices({|src,start,num,data| - var mfcc, stats, writer, flatten,mfccBuf, statsBuf, flatBuf, label, voice; - label = data.key; + var mfcc, stats, writer, flatten, label, index, voice; + label = data.value[\prefix]; + index = data.value[\index]; voice = data.value[\voice]; mfcc = FluidBufMFCC.kr(src,startFrame:start,numFrames:num,numChans:1,features:~mfccbuf[voice],trig:1); stats = FluidBufStats.kr(~mfccbuf[voice],stats:~statsbuf[voice],trig:Done.kr(mfcc)); flatten = FluidBufFlatten.kr(~statsbuf[voice],~flatbuf[voice],trig:Done.kr(stats)); - writer = FluidDataSetWr.kr(~ds,label,buf: ~flatbuf[voice],trig:Done.kr(flatten)) + writer = FluidDataSetWr.kr(~ds,label, index, ~flatbuf[voice], Done.kr(flatten)) }); )