Merge pull request otalk#39 from ibc/fix-audioContext-issue38

Ensure a single AudioContext is internally created

README.md

@@ -68,7 +68,7 @@ speech.on('speaking', function() {
 * `interval` (optional, default 100ms) how frequently the analyser polls the audio stream to check if speaking has started or stopped. This will also be the frequency of the `volume_change` events.
 * `threshold` (optional, default -50db) the volume at which `speaking`/`stopped\_speaking` events will be fired
 * `play` (optional, default true for audio tags, false for webrtc streams) whether the audio stream should also be piped to the speakers, or just swallowed by the analyser. Typically for audio tags you would want to hear them, but for microphone based webrtc streams you may not to avoid feedback.
-* `audioContext` (optional, default is to create a new context) If you have already created an `AudioContext`, you can pass it to hark to avoid unnecessarily creating more than one.
+* `audioContext` (optional, default is to create a single context) If you have already created an `AudioContext`, you can pass it to hark to use it instead of an internally generated one.
 
 ## Understanding dB/volume threshold
 

example/demo.bundle.js

@@ -126,7 +126,7 @@ for (var i = 0; i < 100; i++) {
  window.requestAnimationFrame(draw);
 })();
 
-},{"../hark.js":2,"attachmediastream":5,"bows":3,"getusermedia":4}],4:[function(require,module,exports){
+},{"../hark.js":2,"attachmediastream":5,"bows":4,"getusermedia":3}],3:[function(require,module,exports){
 // getUserMedia helper by @HenrikJoreteg
 var func = (navigator.getUserMedia ||
  navigator.webkitGetUserMedia ||
@@ -228,7 +228,6 @@ var audioContext = null;
 module.exports = function(stream, options) {
  var harker = new WildEmitter();
 
-
  // make it not break in non-supported browsers
  if (!audioContextType) return harker;
 
@@ -239,13 +238,11 @@ module.exports = function(stream, options) {
  threshold = options.threshold,
  play = options.play,
  history = options.history || 10,
- audioContext = options.audioContext || null,
  running = true;
 
- //Setup Audio Context
- if (!audioContext) {
- audioContext = new audioContextType();
- }
+ // Ensure that just a single AudioContext is internally created
+ audioContext = options.audioContext || audioContext || new audioContextType();
+
  var sourceNode, fftBins, analyser;
 
  analyser = audioContext.createAnalyser();
@@ -347,7 +344,6 @@ module.exports = function(stream, options) {
  };
  looper();
 
-
  return harker;
 }
 
@@ -506,7 +502,7 @@ WildEmitter.mixin = function (constructor) {
 
 WildEmitter.mixin(WildEmitter);
 
-},{}],3:[function(require,module,exports){
+},{}],4:[function(require,module,exports){
 (function(window) {
  var logger = require('andlog'),
  goldenRatio = 0.618033988749895,
@@ -545,8 +541,18 @@ WildEmitter.mixin(WildEmitter);
 },{"andlog":7}],7:[function(require,module,exports){
 // follow @HenrikJoreteg and @andyet if you like this ;)
 (function () {
+ function getLocalStorageSafely() {
+ var localStorage;
+ try {
+ localStorage = window.localStorage;
+ } catch (e) {
+ // failed: access to localStorage is denied
+ }
+ return localStorage;
+ }
+
  var inNode = typeof window === 'undefined',
- ls = !inNode && window.localStorage,
+ ls = !inNode && getLocalStorageSafely(),
  out = {};
 
  if (inNode) {

hark.bundle.js

@@ -25,7 +25,6 @@ var audioContext = null;
 module.exports = function(stream, options) {
  var harker = new WildEmitter();
 
-
  // make it not break in non-supported browsers
  if (!audioContextType) return harker;
 
@@ -36,13 +35,11 @@ module.exports = function(stream, options) {
  threshold = options.threshold,
  play = options.play,
  history = options.history || 10,
- audioContext = options.audioContext || null,
  running = true;
 
- //Setup Audio Context
- if (!audioContext) {
- audioContext = new audioContextType();
- }
+ // Ensure that just a single AudioContext is internally created
+ audioContext = options.audioContext || audioContext || new audioContextType();
+
  var sourceNode, fftBins, analyser;
 
  analyser = audioContext.createAnalyser();
@@ -144,7 +141,6 @@ module.exports = function(stream, options) {
  };
  looper();
 
-
  return harker;
 }
 

hark.js

@@ -23,7 +23,6 @@ var audioContext = null;
 module.exports = function(stream, options) {
  var harker = new WildEmitter();
 
-
  // make it not break in non-supported browsers
  if (!audioContextType) return harker;
 
@@ -34,13 +33,11 @@ module.exports = function(stream, options) {
  threshold = options.threshold,
  play = options.play,
  history = options.history || 10,
- audioContext = options.audioContext || null,
  running = true;
 
- //Setup Audio Context
- if (!audioContext) {
- audioContext = new audioContextType();
- }
+ // Ensure that just a single AudioContext is internally created
+ audioContext = options.audioContext || audioContext || new audioContextType();
+
  var sourceNode, fftBins, analyser;
 
  analyser = audioContext.createAnalyser();
@@ -142,6 +139,5 @@ module.exports = function(stream, options) {
  };
  looper();
 
-
  return harker;
 }