From 09d2dc3eb5b5ebdb77f49d57b9bd5fd45b582557 Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Fri, 28 Dec 2018 15:04:15 -0800
Subject: [PATCH] Use a legit polyfill

---
 js/media/index.ts          | 89 +++++---------------------------------
 js/stereo-panner-node.d.ts |  3 ++
 package.json               |  6 ++-
 yarn.lock                  | 10 +++++
 4 files changed, 29 insertions(+), 79 deletions(-)
 create mode 100644 js/stereo-panner-node.d.ts

diff --git a/js/media/index.ts b/js/media/index.ts
index c80fb582..9d3858f3 100644
--- a/js/media/index.ts
+++ b/js/media/index.ts
@@ -1,82 +1,17 @@
 /* Emulate the native <audio> element with Web Audio API */
 import { BANDS, MEDIA_STATUS } from "../constants";
+// Safari does not, yet, support the StereoPannerNode, so we use this polyfill
+// Hopefully this can be removed in thefuture.
+import SteroPannerNode from "stereo-panner-node";
 import Emitter from "../emitter";
 import ElementSource from "./elementSource";
 import { Band } from "../types";
 
-// Safari does not, yet, support the StereoPannerNode, so we implement a generic
-// interface which is implemented by either a StereoPannerNode, or two gain
-// nodes depending on the support that the browser provides. Hopefully this can
-// be removed in the future.
-interface Panner {
-  connect(source: AudioNode): void;
-  setBalance(balance: number): void;
-  input: AudioNode;
-}
-
-function createSereoPannerNode(context: AudioContext): Panner {
-  if (context.createStereoPanner) {
-    const panner = context.createStereoPanner();
-    return {
-      connect(source: AudioNode) {
-        panner.connect(source);
-      },
-      setBalance(balance: number) {
-        panner.pan.setValueAtTime(balance, context.currentTime);
-      },
-      input: panner
-    };
+function createStereoPanner(context: AudioContext): StereoPannerNode {
+  if ("createStereoPanner" in context) {
+    return context.createStereoPanner();
   }
-
-  const chanSplit = context.createChannelSplitter(2);
-  const leftGain = context.createGain();
-  const rightGain = context.createGain();
-
-  const chanMerge = context.createChannelMerger(2);
-
-  // I suspect the formatting on these is odd due to Prettier special casing
-  // React Redux's `connect`, but I could be wrong.
-  chanSplit.connect(
-    leftGain,
-    0
-  );
-  chanSplit.connect(
-    rightGain,
-    1
-  );
-
-  leftGain.connect(
-    chanMerge,
-    0,
-    0
-  );
-  rightGain.connect(
-    chanMerge,
-    0,
-    1
-  );
-
-  return {
-    connect(source: AudioNode) {
-      chanMerge.connect(source);
-    },
-    setBalance(balance: number) {
-      if (balance > 0) {
-        // Right
-        leftGain.gain.value = 1 - balance;
-        rightGain.gain.value = 1;
-      } else if (balance < 0) {
-        // Left
-        leftGain.gain.value = 1;
-        rightGain.gain.value = 1 + balance;
-      } else {
-        // Center
-        leftGain.gain.value = 1;
-        rightGain.gain.value = 1;
-      }
-    },
-    input: chanSplit
-  };
+  return new SteroPannerNode(context);
 }
 
 export default class Media {
@@ -86,7 +21,7 @@ export default class Media {
   _balance: number;
   _staticSource: AnalyserNode;
   _preamp: GainNode;
-  _panner: Panner;
+  _panner: StereoPannerNode;
   _analyser: AnalyserNode;
   _gainNode: GainNode;
   _source: ElementSource;
@@ -132,7 +67,7 @@ export default class Media {
     this._preamp = this._context.createGain();
 
     // Create the panner node
-    this._panner = createSereoPannerNode(this._context);
+    this._panner = createStereoPanner(this._context);
 
     // Create the analyser node for the visualizer
     this._analyser = this._context.createAnalyser();
@@ -209,7 +144,7 @@ export default class Media {
       output = filter;
     });
 
-    output.connect(this._panner.input);
+    output.connect(this._panner);
 
     this._panner.connect(this._gainNode);
     this._panner.connect(this._analyser);
@@ -282,7 +217,7 @@ export default class Media {
 
   // From -100 to 100
   setBalance(balance: number) {
-    this._panner.setBalance(balance / 100);
+    this._panner.pan.setValueAtTime(balance / 100, this._context.currentTime);
   }
 
   setEqBand(band: Band, value: number) {
@@ -292,7 +227,7 @@ export default class Media {
 
   disableEq() {
     this._staticSource.disconnect();
-    this._staticSource.connect(this._panner.input);
+    this._staticSource.connect(this._panner);
   }
 
   enableEq() {
diff --git a/js/stereo-panner-node.d.ts b/js/stereo-panner-node.d.ts
new file mode 100644
index 00000000..ddb9e6bc
--- /dev/null
+++ b/js/stereo-panner-node.d.ts
@@ -0,0 +1,3 @@
+declare module "stereo-panner-node" {
+  export default StereoPannerNode;
+}
diff --git a/package.json b/package.json
index 8c678a54..ed3cdc12 100644
--- a/package.json
+++ b/package.json
@@ -64,10 +64,10 @@
     "@types/invariant": "^2.2.29",
     "@types/jest": "^23.3.2",
     "@types/lodash": "^4.14.116",
+    "@types/rc-slider": "^8.6.0",
     "@types/react": "^16.4.18",
     "@types/react-dom": "^16.0.9",
     "@types/react-redux": "^6.0.9",
-    "@types/rc-slider": "^8.6.0",
     "@types/webaudioapi": "^0.0.27",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "^9.0.0-beta.3",
@@ -141,5 +141,7 @@
     ]
   },
   "prettier": {},
-  "dependencies": {}
+  "dependencies": {
+    "stereo-panner-node": "^1.4.0"
+  }
 }
diff --git a/yarn.lock b/yarn.lock
index 9bef3ee5..f3cd46b3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1462,6 +1462,10 @@ balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
 
+base-audio-context@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/base-audio-context/-/base-audio-context-1.1.1.tgz#d75a5b6cbbfda6728722b8590095b5136d8b8d28"
+
 base64-js@^1.0.2:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886"
@@ -8048,6 +8052,12 @@ stealthy-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
 
+stereo-panner-node@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/stereo-panner-node/-/stereo-panner-node-1.4.0.tgz#3af2cd65699716b95e252d40dbf589a2c35dce69"
+  dependencies:
+    base-audio-context "^1.1.1"
+
 stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"