fix UnaryOpSoftClip

Author: briansorahan

binop.go

@@ -23,8 +23,8 @@ func MulAdd(rate int8, in, mul, add Input, numOutputs int) *UgenNode {
 	return NewUgenNode("MulAdd", rate, 0, numOutputs, in, mul, add)
 }
 
-// BinOpSoftClip adds distortion to a ugen.
-func BinOpSoftClip(rate int8, in Input, numOutputs int) *UgenNode {
+// UnaryOpSoftClip adds distortion to a ugen.
+func UnaryOpSoftClip(rate int8, in Input, numOutputs int) *UgenNode {
 	CheckRate(rate)
-	return NewUgenNode("BinaryOpUGen", rate, 43, numOutputs, in)
+	return NewUgenNode("UnaryOpUGen", rate, 43, numOutputs, in)
 }

detect_silence.go

@@ -25,5 +25,5 @@ func (ds DetectSilence) Rate(rate int8) Input {
 	}
 	CheckRate(rate)
 	(&ds).defaults()
-	return UgenInput("DetectSilence", rate, 0, 1, ds.In, ds.Amp, ds.Time)
+	return UgenInput("DetectSilence", rate, 0, 1, ds.In, ds.Amp, ds.Time, C(float32(ds.Done)))
 }

detectsilence_test.go

@@ -3,32 +3,31 @@ package sc
 import "testing"
 
 func TestDetectSilence(t *testing.T) {
+	// TODO: need a way to compare synthdef blobs where the order of the constants doesn't matter
 	t.SkipNow()
 
-	const name = "DetectTheSilence"
+	const name = "DetectSilence"
 
 	def := NewSynthdef(name, func(params Params) Ugen {
 		out := params.Add("out", 0)
 
+		noise := LFDNoise{
+			Interpolation: InterpolationCubic,
+			Freq:          C(8),
+		}.Rate(KR).Max(C(0))
+
 		sine := SinOsc{
-			Freq: Rand{
-				Lo: C(400),
-				Hi: C(700),
-			}.Rate(AR),
-		}.Rate(AR)
+			Freq:  Rand{Lo: C(400), Hi: C(700)}.Rate(AR),
+			Phase: C(0),
+		}.Rate(AR).Mul(noise).SoftClip().Mul(C(0.3))
+
 		return Out{
 			Bus: out,
-			Channels: sine.Mul(LFDNoise{
-				Interpolation: InterpolationCubic,
-				Freq:          C(8),
-			}.Rate(KR)),
+			Channels: DetectSilence{
+				In:   sine,
+				Done: FreeEnclosing,
+			}.Rate(AR),
 		}.Rate(AR)
 	})
-	same, err := def.CompareToFile("fixtures/DetectSilence.scsyndef")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !same {
-		t.Fatalf("synthdef different from sclang version")
-	}
+	compareAndWrite(t, name, def)
 }

multiNode.go

@@ -61,7 +61,7 @@ func (mn *MultiNode) MulAdd(mul, add Input) Input {
 func (mn *MultiNode) SoftClip() Input {
 	a := make([]*UgenNode, len(mn.nodes))
 	for i, n := range mn.nodes {
-		a[i] = BinOpSoftClip(n.Rate(), n, n.numOutputs)
+		a[i] = UnaryOpSoftClip(n.Rate(), n, n.numOutputs)
 	}
 	return &MultiNode{a}
 }

param.go

@@ -85,7 +85,7 @@ func (p *param) MulAdd(mul, add Input) Input {
 }
 
 func (p *param) SoftClip() Input {
-	return BinOpSoftClip(KR, p, 1)
+	return UnaryOpSoftClip(KR, p, 1)
 }
 
 func newParam(name string, index int32, initialValue float32) *param {

ugenNode.go

@@ -2,20 +2,20 @@ package sc
 
 // UGen done actions, see http://doc.sccode.org/Reference/UGen-doneActions.html
 const (
-	DoNothing             = 0
-	Pause                 = 1
-	FreeEnclosing         = 2
-	FreePreceding         = 3
-	FreeFollowing         = 4
-	FreePrecedingGroup    = 5
-	FreeFollowingGroup    = 6
-	FreeAllPreceding      = 7
-	FreeAllFollowing      = 8
-	FreeAndPausePreceding = 9
-	FreeAndPauseFollowing = 10
-	DeepFreePreceding     = 11
-	DeepFreeFollowing     = 12
-	FreeAllInGroup        = 13
+	DoNothing = iota
+	Pause
+	FreeEnclosing
+	FreePreceding
+	FreeFollowing
+	FreePrecedingGroup
+	FreeFollowingGroup
+	FreeAllPreceding
+	FreeAllFollowing
+	FreeAndPausePreceding
+	FreeAndPauseFollowing
+	DeepFreePreceding
+	DeepFreeFollowing
+	FreeAllInGroup
 	// I do not understand the difference between the last and
 	// next-to-last options [bps]
 )
@@ -87,7 +87,7 @@ func (un *UgenNode) MulAdd(mul, add Input) Input {
 
 // SoftClip adds distortion to a ugen.
 func (un *UgenNode) SoftClip() Input {
-	return BinOpSoftClip(un.rate, un, un.numOutputs)
+	return UnaryOpSoftClip(un.rate, un, un.numOutputs)
 }
 
 // NewUgenNode is a factory function for creating new UgenNode instances.