ramp to values to avoid audio glitches

[nanofun.git] / nanofun.js

diff --git a/nanofun.js b/nanofun.js
index 014ebb026423ed5fbc5790ab613d812a8d9c8f9c..b8dcaf96721bd3ad094f32bd6cd8a26b54cce0f5 100644 (file)
--- a/nanofun.js
+++ b/nanofun.js
@@ -295,13 +295,14 @@ var nanofun = function() {
   var self = this;
 
   self.initAudio = function() {
   var self = this;
 
   self.initAudio = function() {

-    self.sample_buffers = Array(16);
-    self.samples = Array(16);
-    self.sample_start_times = Array(16);
+    self.sample_buffers = Array(NANOPAD_TOUCHS.length);
+    self.samples = Array(NANOPAD_TOUCHS.length);
+    self.sample_start_times = Array(NANOPAD_TOUCHS.length);

     self.audioCtx = new window.AudioContext();
     self.audioCtx = new window.AudioContext();

-    self.touchGainNodes = Array(16);
+    self.touchGainNodes = Array(NANOPAD_TOUCHS.length);

     self.masterGainNode = self.audioCtx.createGain();
     self.masterGainNode = self.audioCtx.createGain();

-    for (var i=0; i<16; i++) {
+    self.effectsGainNode = self.audioCtx.createGain();
+    for (var i=0; i<NANOPAD_TOUCHS.length; i++) {

       self.touchGainNodes[i] = self.audioCtx.createGain();
       self.touchGainNodes[i].connect(self.masterGainNode);
     }
       self.touchGainNodes[i] = self.audioCtx.createGain();
       self.touchGainNodes[i].connect(self.masterGainNode);
     }


@@ -316,11 +317,12 @@ var nanofun = function() {
     self.filter = self.audioCtx.createBiquadFilter();
     self.filter.frequency.value = 1000;
 
     self.filter = self.audioCtx.createBiquadFilter();
     self.filter.frequency.value = 1000;
 

+    self.effectsGainNode.connect(self.delay);

     self.delay.connect(self.feedback);
     self.feedback.connect(self.filter);
     self.filter.connect(self.delay);
 
     self.delay.connect(self.feedback);
     self.feedback.connect(self.filter);
     self.filter.connect(self.delay);
 

-    self.masterGainNode.connect(self.delay);
+    self.filter.connect(self.masterGainNode);

   }
 
   self.initMIDI = function() {
   }
 
   self.initMIDI = function() {


@@ -335,7 +337,7 @@ var nanofun = function() {
   self.initUI = function() {
     var $nanopad = $('#nanopad');
     var $nanotouch = $('.nanotouch');
   self.initUI = function() {
     var $nanopad = $('#nanopad');
     var $nanotouch = $('.nanotouch');

-    for (var i=0; i<16; i++) {
+    for (var i=0; i<NANOPAD_TOUCHS.length; i++) {

       var $new_touch = $nanotouch.clone();
       $new_touch.attr('data-touch', i);
       $new_touch.appendTo($nanopad);
       var $new_touch = $nanotouch.clone();
       $new_touch.attr('data-touch', i);
       $new_touch.appendTo($nanopad);


@@ -402,9 +404,20 @@ var nanofun = function() {
       }
     });
 
       }
     });
 

+    $('.effects input').on('change', function() {
+      var effects = $(this).prop('checked');
+      var i = parseInt($(this).parents('.nanotouch').data('touch'));
+      if (effects) {
+        self.touchGainNodes[i].connect(self.effectsGainNode);
+      } else {
+        self.touchGainNodes[i].disconnect(self.effectsGainNode);
+      }
+    });
+

     $('#master-gain').on('change', function() {
       var fraction = parseInt(this.value) / parseInt(127);
     $('#master-gain').on('change', function() {
       var fraction = parseInt(this.value) / parseInt(127);

-      self.masterGainNode.gain.value = fraction * fraction;
+      var now = self.audioCtx.currentTime;
+      self.masterGainNode.gain.exponentialRampToValueAtTime(fraction * fraction, now + 0.015);

     });
 
     $('#delay').on('change', function() {
     });
 
     $('#delay').on('change', function() {


@@ -412,13 +425,15 @@ var nanofun = function() {
       if (value == 0) {
         self.delay.disconnect();
       } else {
       if (value == 0) {
         self.delay.disconnect();
       } else {

-        self.delay.delayTime.value = value;
+        var now = self.audioCtx.currentTime;
+        self.delay.delayTime.exponentialRampToValueAtTime(value, now + 0.015);

         self.delay.connect(self.audioCtx.destination);
       }
     });
 
     $('#feedback').on('change', function() {
         self.delay.connect(self.audioCtx.destination);
       }
     });
 
     $('#feedback').on('change', function() {

-      self.feedback.gain.value = this.value;
+      var now = self.audioCtx.currentTime;
+      self.feedback.gain.exponentialRampToValueAtTime(this.value, now + 0.015);

     });
 
     $('#filter').on('change', function() {
     });
 
     $('#filter').on('change', function() {


@@ -428,11 +443,12 @@ var nanofun = function() {
     $('.touch-gain').on('change', function() {
       var fraction = parseInt(this.value) / parseInt(127);
       var touchIdx = parseInt($(this).parent().data('touch'));
     $('.touch-gain').on('change', function() {
       var fraction = parseInt(this.value) / parseInt(127);
       var touchIdx = parseInt($(this).parent().data('touch'));

-      self.touchGainNodes[touchIdx].gain.value = fraction * fraction;
+      var now = self.audioCtx.currentTime;
+      self.touchGainNodes[touchIdx].gain.exponentialRampToValueAtTime(fraction * fraction, now + 0.015);

     });
 
     self.time_interval_id = setInterval(function() {
     });
 
     self.time_interval_id = setInterval(function() {

-      for (var i=0; i<16; i++) {
+      for (var i=0; i<NANOPAD_TOUCHS.length; i++) {

         var sample = self.samples[i];
         if (sample !== undefined) {
           var start_time = self.sample_start_times[i];
         var sample = self.samples[i];
         if (sample !== undefined) {
           var start_time = self.sample_start_times[i];