From 4c4896e1737249e6f51d85d041ed7113e434d3b1 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Sat, 8 Sep 2018 14:44:56 +0100 Subject: [PATCH 1/2] Updated FluidCompose.sc for new commands --- .../fdCompose/Classes/FDCompose.sc | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/release-packaging/fdCompose/Classes/FDCompose.sc b/release-packaging/fdCompose/Classes/FDCompose.sc index e9fbdc2..3f3acd2 100644 --- a/release-packaging/fdCompose/Classes/FDCompose.sc +++ b/release-packaging/fdCompose/Classes/FDCompose.sc @@ -1,14 +1,11 @@ FDCompose{ - *process { arg server, src, offsetframes1 = 0, numframes1 = -1, offsetchans1 = 0, numchans1 = -1, src1gain = 1, src2, offsetframes2 = 0, numframes2 = -1, offsetchans2 = 0, numchans2 = -1, src2gain = 1, dstbuf; + *process { arg server, src, offsetframes1 = 0, numframes1 = -1, offsetchans1 = 0, numchans1 = -1, src1gain = 1, src1dstoffset = 0, src1dstchanoffset = 0, src2, offsetframes2 = 0, numframes2 = -1, offsetchans2 = 0, numchans2 = -1, src2gain = 1, src2dstoffset = 0, src2dstchanoffset = 0, dstbuf; - server = server ? Server.default; - if(src.bufNum.isNil) {Error("Invalid Buffer").format(thisMethod.name, this.class.name).throw}; + server = server ? Server.default; + if(src.bufNum.isNil) {Error("Invalid Buffer").format(thisMethod.name, this.class.name).throw}; - server.sendMsg(\cmd, \BufCompose ,src.buNum, offsetframes1, numframes1, offsetchans1, numchans1, src1gain, -if( src2.isNil, -1, {src2.bufNum}) ,offsetframes2 ,numframes2 ,offsetchans2 ,numchans2 ,src2gain , -if( dstbuf.isNil, -1, {dstbuf.bufNum})); - - - - } -} \ No newline at end of file + server.sendMsg(\cmd, \BufCompose, src.buNum, offsetframes1, numframes1, offsetchans1, numchans1, src1gain, src1dstoffset, src1dstchanoffset, + if( src2.isNil, -1, {src2.bufNum}), offsetframes2, numframes2, offsetchans2, numchans2, src2gain, src2dstoffset, src2dstchanoffset, + if( dstbuf.isNil, -1, {dstbuf.bufNum})); + } +} From dbeb6162e017ee22995a56bd6c39f886be68156a Mon Sep 17 00:00:00 2001 From: Owen Green Date: Sat, 8 Sep 2018 15:04:40 +0100 Subject: [PATCH 2/2] fdTransients.cpp: Enable EIGEN_USE_BLAS for less crappy performance --- fdTransients/fdTransients.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fdTransients/fdTransients.cpp b/fdTransients/fdTransients.cpp index 365482e..4958308 100644 --- a/fdTransients/fdTransients.cpp +++ b/fdTransients/fdTransients.cpp @@ -1,6 +1,8 @@ // FD_BufNMF, an NRT buffer NMF Processor // A tool from the FluCoMa project, funded by the European Research Council (ERC) under the European Union’s Horizon 2020 research and innovation programme (grant agreement No 725899) +#define EIGEN_USE_BLAS + #include "clients/nrt/TransientNRTClient.hpp" #include "fdNRTBase.hpp" #include "data/FluidTensor.hpp"