fix(CustomVirtualAudioNode): do not pointlessly disconnect parent nod…

…es when a child node needs to be replaced Bug introduced in 06bc0fb, should fix #317
benji6 · Jul 22, 2021 · 5bbe2a9 · 5bbe2a9
1 parent 5aaf5a2
commit 5bbe2a9
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 8 deletions.
diff --git a/src/VirtualAudioNodes/CustomVirtualAudioNode.ts b/src/VirtualAudioNodes/CustomVirtualAudioNode.ts
@@ -71,9 +71,10 @@ export default class CustomVirtualAudioNode extends VirtualAudioNodeBase {
   }
 
   public update(
-    params: IVirtualAudioNodeParams = {},
+    _params: IVirtualAudioNodeParams | null | undefined,
     audioContext: AudioContext
   ): this {
+    const params = _params ?? {};
     const audioGraphParamsFactoryValues = values(this.node(params));
     const keys = Object.keys(this.virtualNodes);
 
@@ -84,7 +85,6 @@ export default class CustomVirtualAudioNode extends VirtualAudioNodeBase {
 
       if (virtualAudioNode.cannotUpdateInPlace(newVirtualAudioNode)) {
         virtualAudioNode.disconnectAndDestroy();
-        this.disconnectParents(virtualAudioNode);
         this.virtualNodes[key] = newVirtualAudioNode.initialize(audioContext);
         continue;
       }
@@ -93,7 +93,6 @@ export default class CustomVirtualAudioNode extends VirtualAudioNodeBase {
 
       if (!equals(newVirtualAudioNode.output, virtualAudioNode.output)) {
         virtualAudioNode.disconnect();
-        this.disconnectParents(virtualAudioNode);
         virtualAudioNode.output = newVirtualAudioNode.output;
       }
     }
@@ -102,8 +101,4 @@ export default class CustomVirtualAudioNode extends VirtualAudioNodeBase {
     this.params = params;
     return this;
   }
-
-  private disconnectParents(vNode: VirtualAudioNode): void {
-    for (const node of values(this.virtualNodes)) node.disconnect(vNode);
-  }
 }
diff --git a/src/VirtualAudioNodes/StandardVirtualAudioNode.ts b/src/VirtualAudioNodes/StandardVirtualAudioNode.ts
@@ -132,7 +132,8 @@ export default class StandardVirtualAudioNode extends VirtualAudioNodeBase {
     return this;
   }
 
-  public update(params: IVirtualAudioNodeParams = {}): this {
+  public update(_params: IVirtualAudioNodeParams | null | undefined): this {
+    const params = _params ?? {};
     const audioNode: IAudioNodePropertyLookup = this.audioNode;
     for (const key of Object.keys(params)) {
       if (constructorParamsKeys.indexOf(key) !== -1) continue;

diff --git a/test/customNodes/__snapshots__/expectedBehaviour.ts.snap b/test/customNodes/__snapshots__/expectedBehaviour.ts.snap
@@ -891,3 +891,33 @@ Object {
   "name": "AudioDestinationNode",
 }
 `;
+
+exports[`custom nodes updating startTime of nested custom nodes 1`] = `
+Object {
+  "inputs": Array [
+    Object {
+      "gain": Object {
+        "inputs": Array [],
+        "value": 1,
+      },
+      "inputs": Array [
+        Object {
+          "detune": Object {
+            "inputs": Array [],
+            "value": 0,
+          },
+          "frequency": Object {
+            "inputs": Array [],
+            "value": 440,
+          },
+          "inputs": Array [],
+          "name": "OscillatorNode",
+          "type": "sine",
+        },
+      ],
+      "name": "GainNode",
+    },
+  ],
+  "name": "AudioDestinationNode",
+}
+`;
diff --git a/test/customNodes/expectedBehaviour.ts b/test/customNodes/expectedBehaviour.ts
@@ -1,4 +1,5 @@
 import createVirtualAudioGraph, * as V from "../../src";
+import { oscillator } from "../../src";
 import gainWithNoParams from "../utils/gainWithNoParams";
 import pingPongDelay from "../utils/pingPongDelay";
 import sineOsc from "../utils/sineOsc";
@@ -210,4 +211,18 @@ describe("custom nodes", () => {
     });
     expect(audioContext.toJSON()).toEqual(expectedData);
   });
+
+  test("updating startTime of nested custom nodes", () => {
+    const voice = V.createNode(({ startTime }) => ({
+      0: gainWithNoParams("output"),
+      1: oscillator(0, { startTime, stopTime: startTime + 1 }),
+    }));
+
+    virtualAudioGraph.update({ 0: voice("output", { startTime: 1 }) });
+    const initialSnapshot = audioContext.toJSON();
+    expect(initialSnapshot).toMatchSnapshot();
+
+    virtualAudioGraph.update({ 0: voice("output", { startTime: 2 }) });
+    expect(initialSnapshot).toEqual(audioContext.toJSON());
+  });
 });