унифицировал обработку

NodeDictionary/NodeDictionary.sc

@@ -8,22 +8,82 @@ NodeDictionary : IdentityDictionary {
         });
     }
 
-  makeAnalysysNdef {
+    processSig {
-	^Ndef(this[\name], {
+        | sig, gate |
-	  var input = SoundIn.ar(\bus.kr(0));
+
-	  var signal = SynthDef.wrap(
+        var releaseNode = if (
-		func: this[\func],
+            this[\sustained].asBoolean,
-		prependArgs: [input]
+            { 2 },
+            { nil }
         );
 
-	  if(this[\convertToKr].isNil.not
+        var envDoneAction = if (
-		and:
+            this[\sustained].asBoolean,
-		this[\convertToKr] == true,
+            { 0 },
-		{
+            { 2 }
-		  A2K.kr(signal);
+        );
-		}, {
+
- 		  signal;
+        if(this[\useLfo].asBoolean, {
+            var lfo = switch(this[\lfoWave])
+            { \sin } { SinOsc }
+            { \saw } { Saw }
+            { \tri } { LFTri }
+            { \pulse } { Pulse }
+            ? SinOsc;
+
+            signal = signal * lfo.kr(
+                \lfoFreq.kr(1)
+            ).range(
+                1 - \lfoGain.kr(0.5), 1
+            );
+        });
+
+        if(this[\useSaturation].asBoolean, {
+            this.getDefaultOr(\saturationSteps, 4).do {
+                signal = signal.tanh;
+            }
+        });
+
+        if(this[\useEnv].asBoolean, {
+            var att = this.getDefaultOr(\attack, 0.1);
+            var rel = this.getDefaultOr(\release, 0.1);
+            var curve = this.getDefaultOr(\curve, 1);
+
+            var env = Env(
+                [0, 0, 1, 0],
+                [0, \attack.kr(att), \release.kr(rel)],
+                [0, \attackCurve.kr(curve), \releaseCurve.kr(curve)],
+                releaseNode: releaseNode,
+            ).kr(envDoneAction, gate: gate);
+
+            signal = signal * env;
+        });
+
+        if(this[\usePan].asBoolean, {
+            switch(this[\panning],
+                \splay, { signal = Splay.ar(signal, \spread.kr(1), center: \pan.kr(0)); },
+                \splayAz, { signal = SplayAz.ar(this[\panningChannels], signal, orientation: \orientation.kr(0.5)); },
+                \pan, { signal = Pan2.ar(signal, \pan.kr(0)); }
+            );
         });
+
+        if(this[\postAmp].asBoolean, {
+            signal = signal * \postAmp.kr(1);
         });
+
+        // if(this[\detectSilence].asBoolean, {
+        //     FreeSelf.kr(
+        //         DetectSilence.ar(
+        //             [signal[0], signal[1]] + Impulse.ar(0)
+        //         ).product)
+        // });
+
+        if(this[\limitDuration].asBoolean, {
+            Line.kr(0, 1, \dur.kr(1), doneAction: 2);
+        });
+
+        signal = signal * \amp.kr(1);
+
+        ^signal;
     }
 }

NodeDictionary/makeBufferProcessingNdef.sc

@@ -1,18 +1,19 @@
 + NodeDictionary {
     makeBufferProcessingNdef {
-	| name, buf, quant = 1.0 |
+        | name |
 
         var internalName = if(name.isNil, {this[\name]}, {name});
 
         Ndef(internalName, {
-	  var freq, signal, env, gate;
+            var signal, gate;
+
+            gate = \gate.tr(0);
 
             signal = SynthDef.wrap(
                 func: this[\func],
-		prependArgs: [buf]
             );
             
-	  signal * \amp.kr(1);
+            this.processSig(signal, gate);
         });
     }
 }

NodeDictionary/makeBufferProcessingSynthDef.sc

@@ -1,32 +1,18 @@
 + NodeDictionary {
     makeBufferProcessingSynthDef {
         SynthDef(this[\name], {
-	  var buf = \buf.kr;
+            var signal, gate;
-	  var signal = SynthDef.wrap(
-		func: this[\func],
-		prependArgs: [buf]
-	  );
 
-	  signal = Pan2.ar(
+            gate = \gate.tr(0);
-		signal * \amp.kr(1),
-		\pan.kr(0)
-	  );
-
-	  if(this[\detectSilence].asBoolean, {
-		FreeSelf.kr(
-		  DetectSilence.ar(
-			[signal[0], signal[1]] + Impulse.ar(0)
-		  ).product)
-	  });
 
-	  if(this[\limitDuration].asBoolean, {
+            signal = SynthDef.wrap(
-		Line.kr(0, 1, \dur.kr(1), doneAction: 2);
+                func: this[\func],
-	  });
+            );
 
             Out.ar(
                 \out.kr(0),
-		signal
+                this.processSig(signal, gate);
             );
-	}).add;
+        });
     }
 }

NodeDictionary/makeSourceNdef.sc

@@ -4,13 +4,7 @@
         var internalName = if(name.isNil, {this[\name]}, {name});
 
         Ndef(internalName, {
-	  var freq, signal, env, gate;
+            var freq, signal, gate;
-
-	  var releaseNode = if (
-		this[\sustained].asBoolean,
-		{ 2 },
-		{ nil }
-	  );
 
             gate = \gate.tr(0);
             freq = \freq.kr(220);
@@ -24,51 +18,7 @@
                 prependArgs: [freq, gate]
             );
             
-	  if(this[\useLfo].asBoolean, {
+            this.processSig(signal, gate);
-		var lfo = switch(this[\lfoWave])
-		{ \sin } { SinOsc }
-		{ \saw } { Saw }
-		{ \tri } { LFTri }
-		{ \pulse } { Pulse }
-		? SinOsc;
-
-		signal = signal * lfo.kr(
-		  \lfoFreq.kr(1)
-		).range(
-		  1 - \lfoGain.kr(0.5), 1
-		);
-	  });
-
-	  if(this[\useSaturation].asBoolean, {
-		this[\saturationSteps].do {
-		  signal = signal.tanh;
-		}
-	  });
-
-	  if(this[\useEnv].asBoolean, {
-		var att = this.getDefaultOr(\attack, 0.1);
-		var rel = this.getDefaultOr(\release, 0.1);
-		var curve = this.getDefaultOr(\curve, 1);
-
-		var env = Env(
-		  [0, 0, 1, 0],
-		  [0, \attack.kr(att), \release.kr(rel)],
-		  [0, \attackCurve.kr(curve), \releaseCurve.kr(curve)],
-		  releaseNode: releaseNode,
-		).kr(0, gate: gate);
-
-		signal = signal * env;
-	  });
-
-	  if(this[\usePan].asBoolean, {
-		switch(this[\panning],
-		  \splay, { signal = Splay.ar(signal, \spread.kr(1), center: \pan.kr(0)); },
-		  \splayAz, { signal = SplayAz.ar(this[\panningChannels], signal, orientation: \orientation.kr(0.5)); },
-		  \pan, { signal = Pan2.ar(signal, \pan.kr(0)); }
-		);
-	  });
-	  
-	  signal * \amp.kr(1);
         });
     }
 }

NodeDictionary/makeSourceSynthDef.sc

@@ -1,19 +1,7 @@
 + NodeDictionary {
     makeSourceSynthDef {
         ^SynthDef(this[\name], {
-	  var freq, signal, env, gate;
+            var freq, signal, gate;
-
-	  var releaseNode = if (
-		this[\sustained].asBoolean,
-		{ 2 },
-		{ nil }
-	  );
-
-	  var envDoneAction = if (
-		this[\sustained].asBoolean,
-		{ 0 },
-		{ 2 }
-	  );
 
             gate = \gate.tr(0);
             freq = \freq.kr(220);
@@ -27,54 +15,6 @@
                 prependArgs: [freq, gate]
             );
            
-	  if(this[\useLfo].asBoolean, {
-		var lfo = switch(this[\lfoWave])
-		{ \sin } { SinOsc }
-		{ \saw } { Saw }
-		{ \tri } { LFTri }
-		{ \pulse } { Pulse }
-		? SinOsc;
-
-		signal = signal * lfo.kr(
-		  \lfoFreq.kr(1)
-		).range(
-		  1 - \lfoGain.kr(0.5), 1
-		);
-	  });
-
-	  if(this[\useSaturation].asBoolean, {
-		this[\saturationSteps].do {
-		  signal = signal.tanh;
-		}
-	  });
-
-	  if(this[\useEnv].asBoolean, {
-		var att = this.getDefaultOr(\attack, 0.1);
-		var rel = this.getDefaultOr(\release, 0.1);
-		var curve = this.getDefaultOr(\curve, 1);
-
-		var env = Env(
-		  [0, 0, 1, 0],
-		  [0, \attack.kr(att), \release.kr(rel)],
-		  \envCurve.kr(curve),
-		  releaseNode: releaseNode,
-		).kr(envDoneAction, gate: gate);
-
-		signal = signal * env;
-	  });
-
-	  switch(this[\panning],
-		\splay, { signal = Splay.ar(signal, \spread.kr(1), center: \pan.kr(0)); },
-		\splayAz, { signal = SplayAz.ar(this[\panningChannels], signal, orientation: \orientation.kr(0.5)); },
-		nil, { signal = Pan2.ar(signal, \pan.kr(0)); }
-	  );
-
-	  signal = signal * \amp.kr(1);
-
-	  if(this[\postAmp].asBoolean, {
-		signal = signal * \postAmp.kr(1);
-	  });
-	  
             Out.ar(
                 \out.kr(0),
                 signal,