seconds mode interval not affected by bpm and time signature

Author: jvntf

examples/Gymnopedia.mp3

@@ -31,23 +31,21 @@ function setup() {
 	count2 = 0;
 	c = color(50);
 	d = color(50);
-  // create a part with 8 spaces, where each space represents 1/16th note (default)
-  looper1 = new p5.SoundLoop(function(time){
-    click.play();
-    console.log('looper1 '+this.clock._nextTick);
+  
+  //the looper's callback is passed the timeFromNow
+  //this value should be used as a reference point from 
+  //which to schedule sounds 
+
+  looper1 = new p5.SoundLoop(function(timeFromNow){
+    click.play(timeFromNow);
     }, 1);
 
-  looper2 = new p5.SoundLoop(function(time){
-    
-	beatbox.play();
-	// console.log(this.clock.ticks);
-  console.log('looper2 ' + this.clock._nextTick); 
+  looper2 = new p5.SoundLoop(function(timeFromNow){  
+  	beatbox.play(timeFromNow);
     }, "16n");
 
-  looper1.start();
-
-  // looper1.start();
-
+  //start the loops together
+  looper1.syncedStart(looper2);
 }
 
 

examples/sound_loop/sketch.js

@@ -30,6 +30,9 @@ define(function (require) {
     this.clock = new Clock({
       'callback' : function(time) {
         var timeFromNow = time - p5sound.audiocontext.currentTime;
+        //Do not initiate the callback if timeFromNow is < 0
+        //This ususually occurs for a few milliseconds when the page
+        //is not fully loaded
         if (timeFromNow > 0) {self.callback(timeFromNow);}
       },
       'frequency' : this._calcFreq()
@@ -111,7 +114,6 @@ define(function (require) {
   };
 
 
-
   /**
    * Updates frequency value, reflected in next callback
    * @private
@@ -128,10 +130,13 @@ define(function (require) {
    * @return {Number} new clock frequency value
    */
   p5.SoundLoop.prototype._calcFreq = function() {
+    //Seconds mode, bpm / timesignature has no effect
     if (typeof this._interval === 'number') {
       this.musicalTimeMode = false;
-      return this._bpm / 60 / this._interval * (this._timeSignature / 4);
-    } else if (typeof this._interval === 'string') {
+      return 1 / this._interval;
+    }
+    //Musical timing mode, calculate interval based bpm, interval,and time signature
+    else if (typeof this._interval === 'string') {
       this.musicalTimeMode = true;
       return this._bpm / 60 / this._convertNotation(this._interval) * (this._timeSignature / 4);
     }