MultiPassThrough: multi-channel passthrough

4 files changed, 78 insertions, 7 deletions

diff --git a/notes_to_tone.wav b/notes_to_tone.wav
new file mode 100644
index 0000000..e2162a5
--- /dev/null
+++ b/notes_to_tone.wav
diff --git a/src/com/jsyn/ports/PortBlockPart.java b/src/com/jsyn/ports/PortBlockPart.java
index 26bbae0..ad75211 100644
--- a/src/com/jsyn/ports/PortBlockPart.java
+++ b/src/com/jsyn/ports/PortBlockPart.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@ import com.softsynth.shared.time.TimeStamp;
 
 /**
  * Part of a multi-part port, for example, the left side of a stereo port.
- * 
+ *
  * @author Phil Burk (C) 2009 Mobileer Inc
  */
 public class PortBlockPart implements ConnectableOutput, ConnectableInput {
@@ -64,7 +64,7 @@ public class PortBlockPart implements ConnectableOutput, ConnectableInput {
         // System.out.println("addConnection from " + this + " to " + otherPart
         // );
         if (connections.contains(otherPart)) {
-            System.out.println("addConnection alreacy had connection from " + this + " to "
+            System.out.println("addConnection already had connection from " + this + " to "
                     + otherPart);
         } else {
             connections.add(otherPart);
diff --git a/src/com/jsyn/unitgen/MultiPassThrough.java b/src/com/jsyn/unitgen/MultiPassThrough.java
new file mode 100644
index 0000000..2461715
--- /dev/null
+++ b/src/com/jsyn/unitgen/MultiPassThrough.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2011 Phil Burk, Mobileer Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.jsyn.unitgen;
+
+import com.jsyn.ports.UnitInputPort;
+import com.jsyn.ports.UnitOutputPort;
+
+/**
+ * Pass the input through to the output unchanged. This is often used for distributing a signal to
+ * multiple ports inside a circuit. It can also be used as a summing node, in other words, a mixer.
+ *
+ * This is just like PassThrough except the input and output ports have multiple parts.
+ * The default is two parts, ie. stereo.
+ *
+ * @author Phil Burk (C) 2016 Mobileer Inc
+ * @see Circuit
+ * @see PassThrough
+ */
+public class MultiPassThrough extends UnitGenerator  implements UnitSink, UnitSource {
+    public UnitInputPort input;
+    public UnitOutputPort output;
+    private int mNumParts;
+
+    /* Define Unit Ports used by connect() and set(). */
+    public MultiPassThrough(int numParts) {
+        mNumParts = numParts;
+        addPort(input = new UnitInputPort(numParts, "Input"));
+        addPort(output = new UnitOutputPort(numParts, "Output"));
+    }
+
+    public MultiPassThrough() {
+        this(2); // stereo
+    }
+
+    @Override
+    public UnitInputPort getInput() {
+        return input;
+    }
+
+    @Override
+    public UnitOutputPort getOutput() {
+        return output;
+    }
+
+    @Override
+    public void generate(int start, int limit) {
+        for (int partIndex = 0; partIndex < mNumParts; partIndex++) {
+            double[] inputs = input.getValues(partIndex);
+            double[] outputs = output.getValues(partIndex);
+
+            for (int i = start; i < limit; i++) {
+                outputs[i] = inputs[i];
+            }
+        }
+    }
+}
diff --git a/src/com/jsyn/unitgen/PassThrough.java b/src/com/jsyn/unitgen/PassThrough.java
index de19c65..8ac0b93 100644
--- a/src/com/jsyn/unitgen/PassThrough.java
+++ b/src/com/jsyn/unitgen/PassThrough.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,9 +19,10 @@ package com.jsyn.unitgen;
 /**
  * Pass the input through to the output unchanged. This is often used for distributing a signal to
  * multiple ports inside a circuit. It can also be used as a summing node, in other words, a mixer.
- * 
+ *
  * @author Phil Burk (C) 2011 Mobileer Inc
  * @see Circuit
+ * @see MultiPassThrough
  */
 public class PassThrough extends UnitFilter {
     @Override