Merge branch 'develop'

CHANGELOG.md

@@ -1,3 +1,13 @@
+# 1.3.1
+
+## Bug fixes
+
+- `AlgaTemp`: fixed support everywhere (e.g, within a `Pfunc`) for `AlgaTemp`s declared with a already compiled `AlgaSynthDef`s.
+
+- `AlgaProxySpace`: removed the overrides for `Symbol.ar` and `Symbol.kr`.
+
+- `AlgaNode`: fixed help filed for `replacePlayTime`.
+
 # 1.3.0
 
 ## New features

Classes/AlgaParser.sc

@@ -119,18 +119,21 @@ AlgaParser {
 			{ defDef.isFunction } {
 				var defName = ("alga_" ++ UniqueID.next).asSymbol;
 
-				//AlgaTemp can be sampleAccurate in AlgaPatterns!
-				functionSynthDefDict[defName] = [
-					AlgaSynthDef.new_inner(
-						defName,
-						defDef,
-						sampleAccurate: algaTemp.sampleAccurate,
-						makeFadeEnv: false,
-						makePatternDef: false,
-						makeOutDef: false
-					),
-					algaTemp
-				];
+				//Protection
+				if(functionSynthDefDict != nil, {
+					//AlgaTemp can be sampleAccurate in AlgaPatterns!
+					functionSynthDefDict[defName] = [
+						AlgaSynthDef.new_inner(
+							defName,
+							defDef,
+							sampleAccurate: algaTemp.sampleAccurate,
+							makeFadeEnv: false,
+							makePatternDef: false,
+							makeOutDef: false
+						),
+						algaTemp
+					];
+				});
 
 				defDef = defName;
 				def[\def] = defName;
@@ -153,18 +156,21 @@ AlgaParser {
 		{ def.isFunction } {
 			var defName = ("alga_" ++ UniqueID.next).asSymbol;
 
-			//AlgaTemp can be sampleAccurate in AlgaPatterns!
-			functionSynthDefDict[defName] = [
-				AlgaSynthDef.new_inner(
-					defName,
-					def,
-					sampleAccurate: algaTemp.sampleAccurate,
-					makeFadeEnv: false,
-					makePatternDef: false,
-					makeOutDef: false
-				),
-				algaTemp
-			];
+			//Protection
+			if(functionSynthDefDict != nil, {
+				//AlgaTemp can be sampleAccurate in AlgaPatterns!
+				functionSynthDefDict[defName] = [
+					AlgaSynthDef.new_inner(
+						defName,
+						def,
+						sampleAccurate: algaTemp.sampleAccurate,
+						makeFadeEnv: false,
+						makePatternDef: false,
+						makeOutDef: false
+					),
+					algaTemp
+				];
+			});
 
 			defDef = defName;
 			algaTemp.setDef(defName); //Substitute .def with the Symbol

Classes/AlgaPattern.sc

@@ -522,9 +522,8 @@ AlgaPattern : AlgaNode {
 		createAlgaTempGroup = false, isFX = false |
 		var tempBus, tempSynth;
 		var tempSynthArgs = [ \gate, 1 ];
-		var tempNumChannels = algaTemp.numChannels;
-		var tempRate = algaTemp.rate;
-		var def, algaTempDef, tempControlNames;
+		var tempNumChannels, tempRate, tempControlNames;
+		var def, algaTempDef;
 		var defIsEvent = false;
 
 		//New AlgaTemp at top level: create a new currentAlgaTempGroup.
@@ -536,8 +535,12 @@ AlgaPattern : AlgaNode {
 
 		//Check AlgaTemp validity
 		if(algaTemp.valid.not, {
-			"AlgaPattern: Invalid AlgaTemp, using default parameter".error;
-			^nil
+			//Try to evaluate once more. It could be an AlgaTemp(\validDef) in a Pfunc
+			this.parseAlgaTempParam(algaTemp);
+			if(algaTemp.valid.not, {
+				"AlgaPattern: Invalid AlgaTemp, using default parameter".error;
+				^nil
+			});
 		});
 
 		//Unpack SynthDef
@@ -550,7 +553,9 @@ AlgaPattern : AlgaNode {
 			defIsEvent = true;
 		});
 
-		//Unpack controlNames
+		//Unpack channels, rate, controlNames
+		tempNumChannels = algaTemp.numChannels;
+		tempRate = algaTemp.rate;
 		tempControlNames = algaTemp.controlNames;
 
 		//Loop around the controlNames to set relevant parameters
@@ -595,7 +600,7 @@ AlgaPattern : AlgaNode {
 						//Scalar parameters
 
 						//Unpack value
-						var paramValue = entry.algaNext;
+						var paramValue = entry.algaNext(this.getCurrentEnvironment);
 
 						//If Symbol, skip iteration
 						if(paramValue.isSymbol, {

Classes/AlgaProxySpace.sc

@@ -17,7 +17,10 @@
 AlgaProxySpace {
 	classvar <paramsArgs;
 	classvar <currentNode;
+	/*
+	// SystemOverwrites/extSymbol
 	classvar <isTriggerDef = false;
+	*/
 	var <nodes;
 	var <objects;
 	var <patternsEvents;
@@ -34,12 +37,26 @@ AlgaProxySpace {
 		^newSpace;
 	}
 
+	*forceBoot { | onBoot, server, algaServerOptions, clock |
+		var newSpace = this.new.init;
+		newSpace.push;
+		server = server ? Server.default;
+		Alga.fBoot(onBoot, server, algaServerOptions, clock);
+		^newSpace;
+	}
+
+	*fBoot { | onBoot, server, algaServerOptions, clock |
+		^this.forceBoot(onBoot, server, algaServerOptions, clock)
+	}
+
 	*initClass {
 		paramsArgs = IdentityDictionary(10);
 	}
 
 	*addParamArgs { | param, value |
-		if(paramsArgs[currentNode] == nil, { paramsArgs[currentNode] = IdentityDictionary() });
+		if(paramsArgs[currentNode] == nil, {
+			paramsArgs[currentNode] = IdentityDictionary()
+		});
 		paramsArgs[currentNode][param] = value;
 	}
 
@@ -134,6 +151,11 @@ AlgaProxySpace {
 
 	pop { Environment.pop }
 
+	quit { | onQuit |
+		Alga.quit(onQuit, server);
+		this.pop;
+	}
+
 	keys { ^nodes.keys }
 
 	//////////////////////
@@ -187,6 +209,8 @@ AlgaProxySpace {
 		^node
 	}
 
+	/*
+	// SystemOverwrites/extSymbol
 	//This allows to retrieve Symbol.kr / Symbol.ar BEFORE they're sent to the server.
 	triggerDef { | node, def |
 		currentNode = node;
@@ -196,6 +220,7 @@ AlgaProxySpace {
 		};
 		isTriggerDef = false;
 	}
+	*/
 
 	explicitNode { | node, key, def |
 		node.clear;
@@ -282,6 +307,8 @@ AlgaProxySpace {
 	}
 
 	replaceNode { | node, key, def |
+		/*
+		// SystemOverwrites/extSymbol
 		//The args replacement ONLY works with AlgaNode
 		if(node.isAlgaPattern.not, {
 			var currentArgsID, currentArgs;
@@ -304,6 +331,7 @@ AlgaProxySpace {
 				});
 			});
 		});
+		*/
 
 		//Standard replace
 		^node.replace(def: def);

Classes/AlgaUtilities.sc

@@ -175,18 +175,22 @@ AlgaTemp {
 		def = argDef
 	}
 
-	checkValidSynthDef { | def |
-		var synthDesc = SynthDescLib.alga.at(def);
+	checkValidSynthDef { | argDef |
+		var synthDesc;
 		var synthDef;
 
+		argDef = argDef ? def;
+		if(argDef.isEvent, { argDef = argDef[\def] });
+
+		synthDesc = SynthDescLib.alga.at(argDef);
 		if(synthDesc == nil, {
-			("AlgaTemp: Invalid AlgaSynthDef: '" ++ def.asString ++ "'").error;
+			("AlgaTemp: Invalid AlgaSynthDef: '" ++ argDef.asString ++ "'").error;
 			^nil;
 		});
 
 		synthDef = synthDesc.def;
 		if(synthDef.isKindOf(SynthDef).not, {
-			("AlgaTemp: Invalid AlgaSynthDef: '" ++ def.asString ++"'").error;
+			("AlgaTemp: Invalid AlgaSynthDef: '" ++ argDef.asString ++ "'").error;
 			^nil;
 		});
 

Classes/SystemOverwrites/extEventStreamPlayer.sc

@@ -36,7 +36,7 @@
 			//[inTime.asStringPrec(17), nextBeat.asStringPrec(17)].debug("inTime, nextBeat");
 			roundedBeat = nextBeat.round;
 			deltaFromRounded = roundedBeat - nextBeat;
-			if (deltaFromRounded.abs < 1e-14 and: { deltaFromRounded != 0 }) {
+			if (deltaFromRounded.abs < 1e-15 and: { deltaFromRounded != 0 }) {
 				nextBeat = roundedBeat;
 				nextTime = nextTime + deltaFromRounded;
 				//nextTime.asStringPrec(17).debug("corrected time");

Classes/SystemOverwrites/extSymbol.sc

@@ -14,14 +14,17 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-//Support for AlgaNode and AlgaArg
+//Support for AlgaNode and AlgaArg.
+//This has been commented out because I could not yet figure out a safe way to implement it
+//so that I would be sure of the instantiation of the AlgaNode sender.
+/*
 +Symbol {
 	ar { | val, lag, spec |
 		if((val.isAlgaNode).or(val.isAlgaArg), {
-			AlgaProxySpace.addParamArgs(this, val);
 			if(AlgaProxySpace.isTriggerDef.not, {
 				^NamedControl.ar(this, 0, lag, spec);
 			}, {
+				AlgaProxySpace.addParamArgs(this, val);
 				^DC.ar(0)
 			});
 		});
@@ -34,10 +37,10 @@
 
 	kr { | val, lag, fixedLag = false, spec |
 		if((val.isAlgaNode).or(val.isAlgaArg), {
-			AlgaProxySpace.addParamArgs(this, val);
 			if(AlgaProxySpace.isTriggerDef.not, {
 				^NamedControl.kr(this, 0, lag, fixedLag, spec)
 			}, {
+				AlgaProxySpace.addParamArgs(this, val);
 				^DC.kr(0)
 			});
 		});
@@ -60,3 +63,4 @@
 	maxLocalBufs { ^nil }
 	maxLocalBufs_ { }
 }
+*/

Examples/Extras/AlgaProxySpace.scd

@@ -4,17 +4,19 @@ p = AlgaProxySpace.boot;
 //A simple node
 ~a = { SinOsc.ar(100) };
 
+(
 //Use it as FM input for another node
 ~b.play(chans:2);
 ~b.interpTime = 2;
 ~b.playTime = 0.5;
-~b = { SinOsc.ar(\freq.ar(~a).range(200, 400)) };
+~b = { SinOsc.ar(\freq.ar(440)) }; ~b.from(~a, \freq, scale: [220, 440]);
+)
 
 //Replace
 ~a = { SinOsc.ar(440) };
 
 //New connection as usual
-~b.from({ LFNoise1.ar(100) }, \freq, time:3)
+~b.from({ LFNoise1.ar(100) }, \freq, time: 3, scale: [330, 660])
 
 //Reset state
 p.clear(time:2);

HelpSource/Classes/AlgaNode.schelp

@@ -262,7 +262,7 @@ Shortcut for emphasis::playTime::.
 
 
 METHOD:: replacePlayTime
-Specify fade in / fade out times when calling emphasis::replace:: on a node that was playing.
+Specify a boolean to determine whether to use code::playTime:: as the time parameter when calling emphasis::replace:: on a node that was playing.
 
 
 METHOD:: rpt

HelpSource/Classes/AlgaProxySpace.schelp

@@ -18,6 +18,12 @@ An instance of link::Classes/AlgaServerOptions:: to boot the server with. If not
 ARGUMENT:: clock
 The emphasis::Clock:: for the internal link::Classes/AlgaScheduler::. If not specified, a default link::Classes/TempoClock:: will be created.
 
+METHOD:: forceBoot
+Same as code::boot::, but using link::Classes/Alga::'s code::forceBoot::.
+
+METHOD:: fBoot
+Alias for code::forceBoot::.
+
 private:: addParamArgs
 private:: currentNode
 private:: nodes
@@ -41,11 +47,14 @@ The link::Classes/Symbol:: key.
 ARGUMENT:: def
 This can be any def supported by an link::Classes/AlgaNode:: / link::Classes/AlgaPattern::.
 
+METHOD:: push
+Push the link::Classes/AlgaProxySpace:: as the new code::currentEnvironment::.
+
 METHOD:: pop
 Restore the previous link::Classes/Environment::.
 
-METHOD:: push
-Push the link::Classes/AlgaProxySpace:: as the new code::currentEnvironment::.
+METHOD:: quit
+Quit link::Classes/Alga:: and restore the previous link::Classes/Environment::.
 
 METHOD:: clear
 Clear all nodes.

HelpSource/Classes/AlgaSequencer.schelp

@@ -17,7 +17,7 @@ INSTANCEMETHODS::
 EXAMPLES::
 code::
 (
-Alga.fBoot({
+Alga.boot({
 	//Poly sequencer featuring AlgaTemps modulating at audio rate
 	~seq = AlgaSequencer((
 		freq: (