Merge pull request #114 from chris-rudmin/mreinstein-master

Mreinstein master

package.json

@@ -1,8 +1,8 @@
 {
   "name": "opus-recorder",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "A library for recording opus encoded audio",
-  "homepage": "https://github.com/chris-rudmin/Recorderjs",
+  "homepage": "https://github.com/chris-rudmin/opus-recorder",
   "author": "Chris Rudmin",
   "keywords": [
     "Ogg",
@@ -30,10 +30,10 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git://github.com/chris-rudmin/Recorderjs.git"
+    "url": "git://github.com/chris-rudmin/opus-recorder.git"
   },
   "bugs": {
-    "url": "https://github.com/chris-rudmin/Recorderjs/issues",
+    "url": "https://github.com/chris-rudmin/opus-recorder/issues",
     "email": "chris.rudmin@gmail.com"
   },
   "scripts": {
@@ -49,5 +49,8 @@
     "sinon": "^2.4.1",
     "sinon-chai": "^2.12.0",
     "webpack": "^3.5.1"
+  },
+  "dependencies": {
+    "get-user-media-promise": "^1.1.1"
   }
 }

src/recorder.js

@@ -1,5 +1,8 @@
 "use strict";
 
+var getUserMedia = require("get-user-media-promise");
+
+
 var Recorder = function( config ){
 
   var that = this;
@@ -40,9 +43,7 @@ var Recorder = function( config ){
 };
 
 Recorder.isRecordingSupported = function(){
-  var AudioContext = global.AudioContext || global.webkitAudioContext;
-  var getUserMedia = global.navigator && ( global.navigator.getUserMedia || ( global.navigator.mediaDevices && global.navigator.mediaDevices.getUserMedia ) );
-  return AudioContext && getUserMedia;
+  return (global.AudioContext || global.webkitAudioContext) && getUserMedia.isSupported;
 };
 
 Recorder.prototype.addEventListener = function( type, listener, useCapture ){
@@ -104,15 +105,7 @@ Recorder.prototype.initStream = function(){
     return global.Promise.resolve( this.stream );
   }
 
-  if ( global.navigator.mediaDevices && global.navigator.mediaDevices.getUserMedia ) {
-    return global.navigator.mediaDevices.getUserMedia( constraints ).then( onStreamInit, onStreamError );
-  }
-
-  if ( global.navigator.getUserMedia ) {
-    return new global.Promise( function( resolve, reject ) {
-      global.navigator.getUserMedia( constraints, resolve, reject );
-    }).then( onStreamInit, onStreamError );
-  }
+  return getUserMedia(constraints).then( onStreamInit, onStreamError );
 };
 
 Recorder.prototype.pause = function(){
@@ -134,7 +127,7 @@ Recorder.prototype.resume = function() {
 };
 
 Recorder.prototype.setMonitorGain = function( gain ){
-  this.monitorNode.gain.value = gain;
+  this.monitorNode.gain.setTargetAtTime(gain, this.audioContext.currentTime, 0.01);
 };
 
 Recorder.prototype.start = function(){

test/recorder.js

@@ -26,13 +26,15 @@ describe('Recorder unsupported', function(){
 describe('Recorder', function(){
 
   var sandbox = sinon.sandbox.create();
-  var Recorder = requireUncached('../dist/recorder.min');
+  var Recorder;
 
   beforeEach(function(){
     global.AudioContext = sandbox.stub();
     global.AudioContext.prototype.createGain = sandbox.stub().returns({ 
       connect: sandbox.stub(),
-      gain: {}
+      gain: {
+        setTargetAtTime: sandbox.stub()
+      }
     });
     global.AudioContext.prototype.createScriptProcessor = sandbox.stub().returns({
       connect: sandbox.stub()
@@ -64,14 +66,18 @@ describe('Recorder', function(){
     global.Worker.prototype.postMessage =  sandbox.stub();
 
     global.Promise = Promise;
+
+    Recorder = requireUncached('../dist/recorder.min');
   });
 
   var mockWebkit = function(){
     delete global.AudioContext;
     global.webkitAudioContext = sandbox.stub();
     global.webkitAudioContext.prototype.createGain = sandbox.stub().returns({ 
       connect: sandbox.stub(),
-      gain: {}
+      gain: {
+        setTargetAtTime: sandbox.stub()
+      }
     });
     global.webkitAudioContext.prototype.createScriptProcessor = sandbox.stub().returns({
       connect: sandbox.stub()
@@ -192,6 +198,7 @@ describe('Recorder', function(){
     global.navigator.getUserMedia = sandbox.stub().yields({
       stop: sandbox.stub()
     });
+    Recorder = requireUncached('../dist/recorder.min');
 
     var rec = new Recorder();
     return rec.initStream().then(function(){
@@ -284,5 +291,12 @@ describe('Recorder', function(){
       expect(ev).instanceof(Error);
       expect(ev.message).to.equal('PermissionDeniedError')
     })
-  })
+  });
+
+  it('should set monitoring gain on init', function () {
+    var rec = new Recorder();
+    return rec.initStream().then(function(){
+      expect(rec.monitorNode.gain.setTargetAtTime).to.have.been.calledOnce;
+    });
+  });
 });