add individual checkboxes for effects

diff --git a/index.html b/index.html
index 91e5690235992364882cc1a005c7690823c5a3bd..1854c668cc4a6bbf9c88b00a46e917c16e892ea8 100644 (file)
--- a/index.html
+++ b/index.html
@@ -14,6 +14,7 @@
    <div class="nanotouch">
      <span class="name"></span>
      <span class="duration"></span>
+     <label class="effects"><input type="checkbox">Effects</label><br>
      <label class="loop"><input type="checkbox">Loop</label><br>
      <input type="file" accept="audio/*" multiple>
      <input class="touch-gain" type="range" min="0" max="127" value="127">
@@ -24,10 +25,12 @@
 
   <form>
     <div><label>Master</label> <input id="master-gain" type="range" min="0" max="127" value="127"></div>
-    <br>
+    <fieldset>
+    <legend>Effects</legend>
     <div><label>Delay</label> <input id="delay" type="range" min="0" max="5" value="0" step="0.1"></div>
     <div><label>Feedback</label> <input id="feedback" type="range" min="0" max="1" value="0.8" step="0.1"></div>
     <div><label>Filter</label> <input id="filter" type="range" min="0" max="5000" value="1000" step="100"></div>
+    </fieldset>
   </form>
 
   <div id="gitclone">Source code at <a href="https://git.0d.be/?p=nanofun.git">https://git.0d.be/?p=nanofun.git</a></div>

diff --git a/nanofun.css b/nanofun.css
index 846a3885005b443289ccfdbb33fb562847ce98a8..74227654a0a3cd90c1329f3b525282aa9427a24b 100644 (file)
--- a/nanofun.css
+++ b/nanofun.css
@@ -59,6 +59,13 @@ div.nanotouch input[type=range] {
   margin: 0;
 }
 
+div.nanotouch .effects {
+  position: absolute;
+  left: 0;
+  bottom: 5ex;
+  z-index: 10000;
+}
+
 div.nanotouch .loop {
   position: absolute;
   left: 0;
@@ -106,3 +113,16 @@ form label {
 #devices div.on {
   background: #6aff6a;
 }
+
+form fieldset {
+  padding: 0;
+  border: 0;
+  margin: 0;
+  margin-top: 1em;
+}
+
+form fieldset legend {
+  font-weight: bold;
+  margin: 0;
+  padding-left: 0;
+}

diff --git a/nanofun.js b/nanofun.js
index 014ebb026423ed5fbc5790ab613d812a8d9c8f9c..bde7c13012ee3ce1e320097e7aec5bdda744b3dc 100644 (file)
--- a/nanofun.js
+++ b/nanofun.js
@@ -295,13 +295,14 @@ var nanofun = 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.touchGainNodes = Array(16);
+    self.touchGainNodes = Array(NANOPAD_TOUCHS.length);
     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);
     }
@@ -316,11 +317,12 @@ var nanofun = function() {
     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.masterGainNode.connect(self.delay);
+    self.filter.connect(self.masterGainNode);
   }
 
   self.initMIDI = function() {
@@ -335,7 +337,7 @@ var nanofun = function() {
   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);
@@ -402,6 +404,16 @@ 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);
       self.masterGainNode.gain.value = fraction * fraction;
@@ -432,7 +444,7 @@ var nanofun = 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];