Rename AudioNode connect/disconnect methods with inputs/outputs

Author: orottier

examples/constant_source.rs

@@ -33,7 +33,7 @@ fn main() {
     // left branch
     let gain_left = context.create_gain();
     gain_left.gain().set_value(0.);
-    gain_left.connect_at(&merger, 0, 0);
+    gain_left.connect_from_output_to_input(&merger, 0, 0);
 
     let mut src_left = context.create_oscillator();
     src_left.frequency().set_value(200.);
@@ -43,7 +43,7 @@ fn main() {
     // right branch
     let gain_right = context.create_gain();
     gain_right.gain().set_value(0.);
-    gain_right.connect_at(&merger, 0, 1);
+    gain_right.connect_from_output_to_input(&merger, 0, 1);
 
     let mut src_right = context.create_oscillator();
     src_right.frequency().set_value(300.);

examples/merger.rs

@@ -46,9 +46,9 @@ fn main() {
     let merger = context.create_channel_merger(2);
 
     // connect left osc to left input of the merger
-    left.connect_at(&merger, 0, 0);
+    left.connect_from_output_to_input(&merger, 0, 0);
     // connect right osc to left input of the merger
-    right.connect_at(&merger, 0, 1);
+    right.connect_from_output_to_input(&merger, 0, 1);
 
     // Connect the merger to speakers
     merger.connect(&context.destination());

examples/multichannel.rs

@@ -57,7 +57,7 @@ fn main() {
         let now = context.current_time();
 
         let mut osc = context.create_oscillator();
-        osc.connect_at(&merger, 0, output_channel);
+        osc.connect_from_output_to_input(&merger, 0, output_channel);
         osc.frequency().set_value(200.);
         osc.start_at(now);
         osc.stop_at(now + 1.);

src/node/audio_node.rs

@@ -245,7 +245,7 @@ pub trait AudioNode {
     /// This function will panic when
     /// - the AudioContext of the source and destination does not match
     fn connect<'a>(&self, dest: &'a dyn AudioNode) -> &'a dyn AudioNode {
-        self.connect_at(dest, 0, 0)
+        self.connect_from_output_to_input(dest, 0, 0)
     }
 
     /// Connect a specific output of this AudioNode to a specific input of another node.
@@ -256,7 +256,7 @@ pub trait AudioNode {
     /// - the AudioContext of the source and destination does not match
     /// - if the input port is out of bounds for the destination node
     /// - if the output port is out of bounds for the source node
-    fn connect_at<'a>(
+    fn connect_from_output_to_input<'a>(
         &self,
         dest: &'a dyn AudioNode,
         output: usize,
@@ -340,7 +340,7 @@ pub trait AudioNode {
     /// - the AudioContext of the source and destination does not match
     /// - if the output port is out of bounds for the source node
     /// - the source node was not connected to the destination node
-    fn disconnect_dest_output(&self, dest: &dyn AudioNode, output: usize) {
+    fn disconnect_dest_from_output(&self, dest: &dyn AudioNode, output: usize) {
         assert!(
             self.context() == dest.context(),
             "InvalidAccessError - Attempting to disconnect nodes from different contexts"
@@ -370,7 +370,12 @@ pub trait AudioNode {
     /// - if the input port is out of bounds for the destination node
     /// - if the output port is out of bounds for the source node
     /// - the source node was not connected to the destination node
-    fn disconnect_dest_output_input(&self, dest: &dyn AudioNode, output: usize, input: usize) {
+    fn disconnect_dest_from_output_to_input(
+        &self,
+        dest: &dyn AudioNode,
+        output: usize,
+        input: usize,
+    ) {
         assert!(
             self.context() == dest.context(),
             "InvalidAccessError - Attempting to disconnect nodes from different contexts"

src/node/channel_merger.rs

@@ -213,12 +213,12 @@ mod tests {
 
         let mut src1 = context.create_constant_source();
         src1.offset().set_value(2.);
-        src1.connect_at(&merger, 0, 0);
+        src1.connect_from_output_to_input(&merger, 0, 0);
         src1.start();
 
         let mut src2 = context.create_constant_source();
         src2.offset().set_value(3.);
-        src2.connect_at(&merger, 0, 1);
+        src2.connect_from_output_to_input(&merger, 0, 1);
         src2.start();
 
         let buffer = context.start_rendering_sync();
@@ -242,12 +242,12 @@ mod tests {
 
         let mut src1 = context.create_constant_source();
         src1.offset().set_value(2.);
-        src1.connect_at(&merger, 0, 0);
+        src1.connect_from_output_to_input(&merger, 0, 0);
         src1.start();
 
         let mut src2 = context.create_constant_source();
         src2.offset().set_value(3.);
-        src2.connect_at(&merger, 0, 1);
+        src2.connect_from_output_to_input(&merger, 0, 1);
         src2.start();
 
         context.suspend_sync(disconnect_at, move |_| src2.disconnect());

src/node/channel_splitter.rs

@@ -265,7 +265,7 @@ mod tests {
         let splitter = context.create_channel_splitter(2);
 
         // connect the 2nd output to the destination
-        splitter.connect_at(&context.destination(), 1, 0);
+        splitter.connect_from_output_to_input(&context.destination(), 1, 0);
 
         // create buffer with sample value 1. left, value -1. right
         let audio_buffer = AudioBuffer::from(vec![vec![1.], vec![-1.]], 48000.);

src/node/delay.rs

@@ -127,7 +127,7 @@ impl AudioNode for DelayNode {
     }
 
     /// Connect a specific output of this AudioNode to a specific input of another node.
-    fn connect_at<'a>(
+    fn connect_from_output_to_input<'a>(
         &self,
         dest: &'a dyn AudioNode,
         output: usize,
@@ -212,7 +212,7 @@ impl AudioNode for DelayNode {
     /// - the AudioContext of the source and destination does not match
     /// - if the output port is out of bounds for the source node
     /// - the source node was not connected to the destination node
-    fn disconnect_dest_output(&self, dest: &dyn AudioNode, output: usize) {
+    fn disconnect_dest_from_output(&self, dest: &dyn AudioNode, output: usize) {
         assert!(
             self.context() == dest.context(),
             "InvalidAccessError - Attempting to disconnect nodes from different contexts"
@@ -242,7 +242,12 @@ impl AudioNode for DelayNode {
     /// - if the input port is out of bounds for the destination node
     /// - if the output port is out of bounds for the source node
     /// - the source node was not connected to the destination node
-    fn disconnect_dest_output_input(&self, dest: &dyn AudioNode, output: usize, input: usize) {
+    fn disconnect_dest_from_output_to_input(
+        &self,
+        dest: &dyn AudioNode,
+        output: usize,
+        input: usize,
+    ) {
         assert!(
             self.context() == dest.context(),
             "InvalidAccessError - Attempting to disconnect nodes from different contexts"