More triage on SC data classes. 93rd time's the charm

nix
Owen Green 6 years ago
parent 72f5982443
commit 8ec4496d9e

@ -24,6 +24,7 @@ FluidDataSet : FluidManipulationClient {
}
init {|name|
this.baseinit(FluidManipulationClient.prServerString(name));
id = name;
this.cache;
}

@ -8,6 +8,7 @@ FluidDataSetQuery : FluidManipulationClient {
init {|uid|
id = uid;
this.baseinit(uid);
}
addColumn{|column, action|

@ -22,6 +22,7 @@ FluidLabelSet : FluidManipulationClient {
}
init { |name|
this.baseinit(FluidManipulationClient.prServerString(name));
id = name;
this.cache;
}

@ -53,7 +53,7 @@ FluidManipulationClient {
if(server.serverRunning.not,{
(this.asString + " server not running").error; ^nil
});
^super.newCopyArgs(server ?? {Server.default}).baseinit(objectID,*args)
^super.newCopyArgs(server ?? {Server.default});//.baseinit(objectID,*args)
}
makeDef { |defName,objectID,args|
@ -135,7 +135,7 @@ FluidManipulationClient {
FluidDataClient : FluidManipulationClient {
classvar synthControls;
var synthControls;
var <id;
var parameters;
@ -147,16 +147,17 @@ FluidDataClient : FluidManipulationClient {
*new1{ |server, params|
var uid = UniqueID.next;
params = params ?? {[]};
if(params.size > 0 and: synthControls.isNil) {synthControls = params.unlace[0]};
^super.new(server, uid, *params) !? { |inst| inst.init(uid, params) }
}
init { |uid, params|
id = uid;
params = params ?? {[]};
if(params.size > 0 and: synthControls.isNil) {synthControls = params.unlace[0]};
parameters = ().putPairs(params);
parameterDefaults = parameters.copy;
this.makePropertyMethods;
this.baseinit(uid,*params);
}
makePropertyMethods{
@ -204,10 +205,20 @@ FluidRTDataClient : FluidDataClient
*new1{|server, params|
params = params ?? {[]};
^super.new1(server,params)
}
init { |uid, params|
id = uid;
params = params ?? {[]};
if(params.size > 0) {synthControls = params.unlace[0]}{synthControls=[]};
params = params ++ [\inBus,Bus.control,\outBus,Bus.control,\inBuffer,-1,\outBuffer,-1];
^super.new1(server,params)
parameters = ().putPairs(params);
parameterDefaults = parameters.copy;
this.makePropertyMethods;
this.baseinit(uid,*params);
}
makeDef {|defName,uid,args|

@ -12,6 +12,7 @@ section:: Containers
Map id labels to data points, or to other labels
link::Classes/FluidDataSet::
link::Classes/FluidLabelSet::

Loading…
Cancel
Save