cleaned up, added connect, disconnect, dispose

Author: jvntf

src/audioVoice.js

@@ -7,40 +7,23 @@ define(function() {
    * handles note triggering and what not
    */
   p5.AudioVoice = function () {
-
-
-	  //this.osctype = 'sine';
-	  //this.volume= 0.33;
-	  //this.note = 60;
-	  this.note;
-
-	  // this.attack = 0.25;
-	  // this.decay=0.25;
-	  // this.sustain=0.95;
-	  // this.release=0.25;
-	  //this.env = new p5.Env(this.attack,this.volume, this.decay,this.volume,  this.sustain, this.volume,this.release);
-
-	  //this.filter.set(22050, 5);
-
-	  //this.env.connect(this.filter);
-	  //
 	  this.ac = p5sound.audiocontext;
 	  this.output = this.ac.createGain();
 	  this.connect();
 
 	  p5sound.soundArray.push(this);
   };
 
-  p5.AudioVoice.prototype._setNote = function() {
+  p5.AudioVoice.prototype._setNote = function(note) {
   };
 
-  p5.AudioVoice.prototype.play = function () {
+  p5.AudioVoice.prototype.play = function (note, velocity, secondsFromNow, sustime) {
   };
 
   p5.AudioVoice.prototype.triggerAttack = function (note, velocity, secondsFromNow) {
   };
 
-  p5.AudioVoice.prototype.triggerRelease = function () {
+  p5.AudioVoice.prototype.triggerRelease = function (secondsFromNow) {
   };
 
   p5.AudioVoice.prototype.amp = function(vol, rampTime) {

src/monosynth.js

@@ -22,19 +22,8 @@ define(function (require) {
   p5.MonoSynth = function () {
     AudioVoice.call(this);
 
-    // this.ac = p5sound.audiocontext;
-
-    // this.output = this.ac.createGain();
-
-    // this.attack = 0.02;
-    // this.decay=0.25;
-    // this.sustain=0.05;
-    // this.release=0.35;
-
-    // default voice
     this.oscillator = new p5.Oscillator();
 
-    // envelope
     this.env = new p5.Env();
     this.env.setRange(1, 0);
     this.env.setExp(true);
@@ -99,9 +88,12 @@ define(function (require) {
 
     // set range of env (TO DO: allow this to be scheduled in advance)
     var vel = velocity || 1;
-    this.env.setRange(vel, 0);
+    // this.env.setRange(vel, 0);
+
+    // this.env.play(this.output, secondsFromNow, susTime);
 
-    this.env.play(this.output, secondsFromNow, susTime);
+    this.triggerAttack(note,velocity,secondsFromNow);
+    this.triggerRelease(secondsFromNow + susTime);
   };
 
   /**
@@ -133,7 +125,6 @@ define(function (require) {
   p5.MonoSynth.prototype.triggerRelease = function (secondsFromNow) {
     this.env.ramp(this.output, secondsFromNow, 0);
     this._isOn = false;
-    // this.env.triggerRelease(this.output, secondsFromNow);
   };
 
 
@@ -151,10 +142,13 @@ define(function (require) {
      */  
 
   p5.MonoSynth.prototype.setParams = function(params) {
-
   };
 
-
+  /**
+   * loads preset values
+   * @param  {String} preset  A preset that has been written for MonoSynth
+   * @return {Object}        Return the MonoSynth
+   */
   p5.MonoSynth.prototype.loadPreset = function(preset) {
     var options = this[preset];
     this.oscillator.setType(options.oscillator.type);
@@ -219,6 +213,7 @@ define(function (require) {
       'res' : 1
     }
   };
+
   /**
      *  Set values like a traditional
      *  <a href="https://en.wikipedia.org/wiki/Synthesizer#/media/File:ADSR_parameter.svg">
@@ -246,6 +241,13 @@ define(function (require) {
   };
 
 
+  /**
+   * Getters and Setters
+   * @param {Number} attack
+   * @param {Number} decay
+   * @param {Number} sustain
+   * @param {Number} release
+   */
   Object.defineProperties(p5.MonoSynth, {
     'attack': {
       get : function() {
@@ -285,12 +287,18 @@ define(function (require) {
     },
   });
 
+  /**
+   * MonoSynth amp
+   * @method  amp
+   * @param  {Number} vol      desired volume
+   * @param  {Number} [rampTime] Time to reach new volume
+   * @return {Number}          new volume value
+   */
   p5.MonoSynth.prototype.amp = function(vol, rampTime) {
     var t = rampTime || 0;
     if (typeof vol !== 'undefined') {
       this.oscillator.amp(vol, t);
     }
-
     return this.oscillator.amp().value;
   };
 
@@ -322,7 +330,7 @@ define(function (require) {
    *  @method  dispose
    */
   p5.MonoSynth.prototype.dispose = function() {
-    AudioVoice.prototype.disposed.apply(this);
+    AudioVoice.prototype.dispose.apply(this);
 
     this.filter.dispose();
     this.env.dispose();