p5.Gain connectSource --> setInput

Author: therewasaguy

lib/p5.sound.js

@@ -6867,70 +6867,70 @@ gain = function () {
   'use strict';
   var p5sound = master;
   /**
-      *  A gain node is usefull to set the relative volume of sound.
-      *  It's typically used to build mixers.	  
-      *
-      *  @class p5.Gain
-      *  @constructor
-      *  @example
-      *  <div><code>
-  	*
-  	*	// load two soundfile and crossfade beetween them
-  	*	var sound1,sound2;
-  	*	var gain1, gain2, gain3;
-  	*	
-  	*	function preload(){
-    	*		soundFormats('ogg', 'mp3');
-    	*		sound1 = loadSound('../_files/Damscray_-_Dancing_Tiger_01');
-    	*		sound2 = loadSound('../_files/beat.mp3');
-  	*	}
-  	*
-  	*	function setup() {
-    	*		createCanvas(400,200);
-  	*
-    	*		// create a 'master' gain to which we will connect both soundfiles
-    	*		gain3 = new p5.Gain();
-    	*		gain3.connect();
-  	*
-    	*		// setup first sound for playing
-    	*		sound1.rate(1);
-    	*		sound1.loop();
-    	*		sound1.disconnect(); // diconnect from p5 output
-  	*
-    	*		gain1 = new p5.Gain(); // setup a gain node
-    	*		gain1.connectSource(sound1); // connect the first sound to its input
-    	*		gain1.connect(gain3); // connect its output to the 'master'
-  	*
-    	*		sound2.rate(1);
-    	*		sound2.disconnect();
-    	*		sound2.loop();
-  	*
-    	*		gain2 = new p5.Gain();
-    	*		gain2.connectSource(sound2);
-    	*		gain2.connect(gain3);
-  	*
-  	*	}
-  	*
-  	*	function draw(){
-   	*		background(180);
-  	*  
-    	*		// calculate the horizontal distance beetween the mouse and the right of the screen
-    	*		var d = dist(mouseX,0,width,0);
-  	*
-    	*		// map the horizontal position of the mouse to values useable for volume control of sound1
-    	*		var vol1 = map(mouseX,0,width,0,1); 
-    	*		var vol2 = 1-vol1; // when sound1 is loud, sound2 is quiet and vice versa
-  	*
-    	*		gain1.amp(vol1,0.5,0);
-    	*		gain2.amp(vol2,0.5,0);
-  	*
-    	*		// map the vertical position of the mouse to values useable for 'master volume control'
-    	*		var vol3 = map(mouseY,0,height,0,1); 
-    	*		gain3.amp(vol3,0.5,0);
-     	*	}
-     	*</code></div>
-     	*
-     	*/
+    *  A gain node is usefull to set the relative volume of sound.
+    *  It's typically used to build mixers.	  
+    *
+    *  @class p5.Gain
+    *  @constructor
+    *  @example
+    *  <div><code>
+   *
+   *	// load two soundfile and crossfade beetween them
+   *	var sound1,sound2;
+   *	var gain1, gain2, gain3;
+   *	
+   *	function preload(){
+  	*		soundFormats('ogg', 'mp3');
+  	*		sound1 = loadSound('../_files/Damscray_-_Dancing_Tiger_01');
+  	*		sound2 = loadSound('../_files/beat.mp3');
+   *	}
+   *
+   *	function setup() {
+  	*		createCanvas(400,200);
+   *
+  	*		// create a 'master' gain to which we will connect both soundfiles
+  	*		gain3 = new p5.Gain();
+  	*		gain3.connect();
+   *
+  	*		// setup first sound for playing
+  	*		sound1.rate(1);
+  	*		sound1.loop();
+  	*		sound1.disconnect(); // diconnect from p5 output
+   *
+  	*		gain1 = new p5.Gain(); // setup a gain node
+  	*		gain1.setInput(sound1); // connect the first sound to its input
+  	*		gain1.connect(gain3); // connect its output to the 'master'
+   *
+  	*		sound2.rate(1);
+  	*		sound2.disconnect();
+  	*		sound2.loop();
+   *
+  	*		gain2 = new p5.Gain();
+  	*		gain2.setInput(sound2);
+  	*		gain2.connect(gain3);
+   *
+   *	}
+   *
+   *	function draw(){
+    *		background(180);
+   *  
+  	*		// calculate the horizontal distance beetween the mouse and the right of the screen
+  	*		var d = dist(mouseX,0,width,0);
+   *
+  	*		// map the horizontal position of the mouse to values useable for volume control of sound1
+  	*		var vol1 = map(mouseX,0,width,0,1); 
+  	*		var vol2 = 1-vol1; // when sound1 is loud, sound2 is quiet and vice versa
+   *
+  	*		gain1.amp(vol1,0.5,0);
+  	*		gain2.amp(vol2,0.5,0);
+   *
+  	*		// map the vertical position of the mouse to values useable for 'master volume control'
+  	*		var vol3 = map(mouseY,0,height,0,1); 
+  	*		gain3.amp(vol3,0.5,0);
+   	*	}
+   	*</code></div>
+   	*
+   	*/
   p5.Gain = function () {
     this.ac = p5sound.audiocontext;
     this.input = this.ac.createGain();
@@ -6942,11 +6942,11 @@ gain = function () {
   /**
    *  Connect a source to the gain node.
    *  
-   *  @method  connectSource
+   *  @method  setInput
    *  @param  {Object} src     p5.sound / Web Audio object with a sound
    *                           output.
    */
-  p5.Gain.prototype.connectSource = function (src) {
+  p5.Gain.prototype.setInput = function (src) {
     src.connect(this.input);
   };
   /**
@@ -6982,8 +6982,8 @@ gain = function () {
     var now = p5sound.audiocontext.currentTime;
     var currentVol = this.output.gain.value;
     this.output.gain.cancelScheduledValues(now);
-    this.output.gain.linearRampToValueAtTime(currentVol, now + tFromNow + 0.001);
-    this.output.gain.linearRampToValueAtTime(vol, now + tFromNow + rampTime + 0.001);
+    this.output.gain.linearRampToValueAtTime(currentVol, now + tFromNow);
+    this.output.gain.linearRampToValueAtTime(vol, now + tFromNow + rampTime);
   };
 }(master, sndcore);
 var src_app;