diff --git a/release-packaging/Classes/FluidMessageTest.sc b/release-packaging/Classes/FluidMessageTest.sc deleted file mode 100644 index dffb399..0000000 --- a/release-packaging/Classes/FluidMessageTest.sc +++ /dev/null @@ -1,120 +0,0 @@ -FluidMessageTest : FluidModelObject { - - var server; - - // *kr { |trig = 1, blocking = 0| - // - // ^this.multiNew('control', trig, blocking); - // } - - testReturnStrings { |server, nodeID, action| - - server = server ? Server.default; - - server.sendMsg('/u_cmd',nodeID,this.synthIndex,'testReturnStrings'); - - OSCFunc( - { |msg| - var resp =FluidMessageResponse.collectArgs( - 4.collect{string(FluidMessageResponse,_,_)}, msg.drop(3)); - if(action.notNil){action.value(resp);}; - },'/testReturnStrings').oneShot; - - } - - testReturnNumbers{ |server, nodeID, action| - - server = server ? Server.default; - - server.sendMsg('/u_cmd',nodeID,this.synthIndex,'testReturnNumbers'); - - OSCFunc( - { |msg| - var result = FluidMessageResponse.collectArgs( - [numbers(FluidMessageResponse,_,100,_)], msg.drop(3)); - if(action.notNil){action.value(result);}; - },'/testReturnNumbers').oneShot; - } - - testReturnOneString{ |server, nodeID, action| - - server = server ? Server.default; - - server.sendMsg('/u_cmd',nodeID,this.synthIndex,'testReturnOneString'); - - OSCFunc( - { |msg| - var result = FluidMessageResponse.collectArgs( - [string(FluidMessageResponse,_,_)], msg.drop(3)); - if(action.notNil){action.value(result);}; - },'/testReturnOneString').oneShot; - } - - testReturnOneNumber{ |server, nodeID, action| - - server = server ? Server.default; - - server.sendMsg('/u_cmd',nodeID,this.synthIndex,'testReturnOneNumber'); - - OSCFunc( - { |msg| - var result = msg.drop(3); - if(action.notNil){action.value(result);}; - },'/testReturnOneNumber').oneShot; - } - - testAccessBuffer{ |server, nodeID, buf, action| - - server = server ? Server.default; - - server.sendMsg('/u_cmd',nodeID,this.synthIndex,'testAccessBuffer', buf.asUGenInput); - - OSCFunc( - { |msg| - var result = FluidMessageResponse.collectArgs([numbers(FluidMessageResponse,_,1,_)],msg.drop(3)); - if(action.notNil){action.value(result);}; - },'/testAccessBuffer').oneShot; - } - - testPassString{ |server, nodeID, str, a, b, c, d, action| - - server = server ? Server.default; - - server.sendMsg('/u_cmd',nodeID,this.synthIndex,'testPassString', str, a, b, c); - - OSCFunc( - { |msg| - if(action.notNil){action.value;}; - },'/testPassString').oneShot; - } - - - testReturnBuffer{ |server, nodeID, b, action| - - server = server ? Server.default; - - server.sendMsg('/u_cmd',nodeID,this.synthIndex,'testReturnBuffer', b.asUGenInput); - - OSCFunc( - { |msg| - var result = result = FluidMessageResponse.collectArgs([buffer(FluidMessageResponse,_,server,_)],msg.drop(3)); - if(action.notNil){action.value(result);}; - },'/testReturnBuffer').oneShot; - } - - testReturnHetero{ |server, nodeID, action| - - server = server ? Server.default; - - server.sendMsg('/u_cmd',nodeID,this.synthIndex,'testReturnHetero'); - - OSCFunc( - { |msg| - var result = result = FluidMessageResponse.collectArgs([string(FluidMessageResponse,_,_), numbers(FluidMessageResponse,_,2,_)],msg.drop(3)); - if(action.notNil){action.value(result);}; - },'/testReturnHetero').oneShot; - } - - - -} diff --git a/release-packaging/Classes/FluidProviderTest.sc b/release-packaging/Classes/FluidProviderTest.sc deleted file mode 100644 index e368dbe..0000000 --- a/release-packaging/Classes/FluidProviderTest.sc +++ /dev/null @@ -1,59 +0,0 @@ -FluidProviderTest : FluidModelObject { - -/* var <> server; - var <> nodeID; - - *new{ |server, name| - - - - }*/ - - // *kr{ |name,vals| - // ^this.new1('control',name,vals); - // } - // - // *new1 { |rate, name,vals| - // var ascii = name.ascii; - // var args; - // vals ?? {vals = []}; - // if(vals.isArray.not) {vals = [vals]}; - // args = ([rate, ascii.size].addAll(ascii) ++ vals.size).addAll(vals).addAll([1,1]); - // args.postln; - // ^super.new1(*args); - // } - -/* init { |size...chars| - specialIndex = -1; - inputs = [size].addAll(chars); - }*/ - - addPoint{|server, nodeID, args, action| - this.prSendMsg(server, nodeID, 'addPoint',args,action); - } - - updatePoint{|server, nodeID, args, action| - this.prSendMsg(server, nodeID, 'updatePoint',args,action); - } - - deletePoint{|server, nodeID, args, action| - this.prSendMsg(server,nodeID, 'deletePoint',args,action); - } - - prSendMsg { |server, nodeID, msg, args, action,parser| - - server = server ? Server.default; - - server.listSendMsg(['/u_cmd',nodeID.nodeID,this.synthIndex,msg].addAll(args)); - - OSCFunc( - { |msg| - var result = FluidMessageResponse.collectArgs(parser,msg.drop(3)); - if(action.notNil){action.value(result)}{action.value}; - },'/'++msg).oneShot; - } - - - - -} diff --git a/release-packaging/Classes/FluidSubscriberTest.sc b/release-packaging/Classes/FluidSubscriberTest.sc deleted file mode 100644 index a04776f..0000000 --- a/release-packaging/Classes/FluidSubscriberTest.sc +++ /dev/null @@ -1,40 +0,0 @@ -FluidSubscriberTest : FluidModelObject { - - var <> providerName; - var <> nodeID; - - // *kr { |provider| - // ^this.multiNew('control',provider); - // } - // - // *new1 { |rate, provider| - // var ascii = provider.ascii; - // ^super.new1(*[rate, ascii.size].addAll(ascii)); - // } - // - // init { |size...chars| - // //Send the number of inputs (size of provider string) as specialIndex, - // //so server plugin knows what's going on - // specialIndex = -1; - // inputs = [size].addAll(chars); - // providerName = chars.collectAs({|x|x.asInteger.asAscii}, String); - // } - - providerLookup { |server, nodeID, label, action| - this.prSendMsg(server, nodeID, 'providerLookup', label, action, - [string(FluidMessageResponse,_,_),numbers(FluidMessageResponse,_,2,_)] ); - } - - prSendMsg { |server, nodeID, msg, args, action,parser| - - server = server ? Server.default; - - server.listSendMsg(['/u_cmd',nodeID.nodeID,this.synthIndex,msg].addAll(args)); - - OSCFunc( - { |msg| - var result = FluidMessageResponse.collectArgs(parser,msg.drop(3)); - if(action.notNil){action.value(result)}{action.value}; - },'/'++msg).oneShot; - } -} diff --git a/src/FluidMessageTest/CMakeLists.txt b/src/FluidMessageTest/CMakeLists.txt deleted file mode 100644 index 3693881..0000000 --- a/src/FluidMessageTest/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -cmake_minimum_required(VERSION 3.3) -get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) -message("Configuring ${PLUGIN}") -set(FILENAME ${PLUGIN}.cpp) - -add_library( - ${PLUGIN} - MODULE - ${FILENAME} -) - -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - -include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidMessageTest/FluidMessageTest.cpp b/src/FluidMessageTest/FluidMessageTest.cpp deleted file mode 100644 index 778df9c..0000000 --- a/src/FluidMessageTest/FluidMessageTest.cpp +++ /dev/null @@ -1,13 +0,0 @@ - -// 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) - -#include -#include - -static InterfaceTable *ft; - -PluginLoad(FluidSTFTUGen) { - ft = inTable; - using namespace fluid::client; - makeSCWrapper("FluidMessageTest", ft); -} diff --git a/src/FluidSubscriberProviderTest/CMakeLists.txt b/src/FluidSubscriberProviderTest/CMakeLists.txt deleted file mode 100644 index 3693881..0000000 --- a/src/FluidSubscriberProviderTest/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -cmake_minimum_required(VERSION 3.3) -get_filename_component(PLUGIN ${CMAKE_CURRENT_LIST_DIR} NAME_WE) -message("Configuring ${PLUGIN}") -set(FILENAME ${PLUGIN}.cpp) - -add_library( - ${PLUGIN} - MODULE - ${FILENAME} -) - -target_include_directories( - ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include -) - -target_link_libraries( - ${PLUGIN} PRIVATE FLUID_DECOMPOSITION -) - -include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake) diff --git a/src/FluidSubscriberProviderTest/FluidSubscriberProviderTest.cpp b/src/FluidSubscriberProviderTest/FluidSubscriberProviderTest.cpp deleted file mode 100644 index 224dadf..0000000 --- a/src/FluidSubscriberProviderTest/FluidSubscriberProviderTest.cpp +++ /dev/null @@ -1,17 +0,0 @@ - -// 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) - -#include -#include -#include - -static InterfaceTable *ft; - -PluginLoad(FluidSTFTUGen) -{ - ft = inTable; - using namespace fluid::client; - makeSCWrapper("FluidProviderTest", ft); - makeSCWrapper("FluidSubscriberTest", ft); - -}