Merge branch 'release/2.0.0'

[rbdr/r.bdr.sh] / jekyll / js / unlimited_pizza / pepperoni.js

diff --git a/jekyll/js/unlimited_pizza/pepperoni.js b/jekyll/js/unlimited_pizza/pepperoni.js
index 58bcc5f29cfc7d77024f5c6893792264454f79b2..c20f285e8ba85bf1bbf45ffa5898a973e4432a2d 100644 (file)
--- a/jekyll/js/unlimited_pizza/pepperoni.js
+++ b/jekyll/js/unlimited_pizza/pepperoni.js
@@ -1,3 +1,5 @@
+'use strict';
+

 Class(UnlimitedPizza, "Pepperoni").inherits(Widget)({
   INNER_HTML : ' \
 <a class="record-button">&#11044</a> \
 Class(UnlimitedPizza, "Pepperoni").inherits(Widget)({
   INNER_HTML : ' \
 <a class="record-button">&#11044</a> \


@@ -13,6 +15,7 @@ Class(UnlimitedPizza, "Pepperoni").inherits(Widget)({
     <input class="filter-switch" name="bandpass-filter" type="checkbox" /> <label for="bandpass-filter">Band Pass</label> \
     <input class="filter-switch" name="hipass-filter" type="checkbox" /> <label for="hipass-filter">Hi Pass</label> \
     <input class="filter-switch" name="lopass-filter" type="checkbox" /> <label for="lopass-filter">Lo Pass</label> \
     <input class="filter-switch" name="bandpass-filter" type="checkbox" /> <label for="bandpass-filter">Band Pass</label> \
     <input class="filter-switch" name="hipass-filter" type="checkbox" /> <label for="hipass-filter">Hi Pass</label> \
     <input class="filter-switch" name="lopass-filter" type="checkbox" /> <label for="lopass-filter">Lo Pass</label> \

+    <input class="filter-switch" name="reverb-filter" type="checkbox" /> <label for="reverb-filter">Reverb</label> \

     <input class="filter-switch" name="distort-filter" type="checkbox" /> <label for="distort-filter">Distort</label> \
   </div> \
 </div> \
     <input class="filter-switch" name="distort-filter" type="checkbox" /> <label for="distort-filter">Distort</label> \
   </div> \
 </div> \


@@ -34,6 +37,8 @@ Class(UnlimitedPizza, "Pepperoni").inherits(Widget)({
     _activatedNodes : null,
     workerPath : '/js/vendor/recorderjs/recorderWorker.js',
     init : function init(config) {
     _activatedNodes : null,
     workerPath : '/js/vendor/recorderjs/recorderWorker.js',
     init : function init(config) {

+      var channels, frameCount, reverbBuffer, request, requestHandler;
+

       Widget.prototype.init.call(this, config);
 
       if (!this.context) {
       Widget.prototype.init.call(this, config);
 
       if (!this.context) {


@@ -67,6 +72,21 @@ Class(UnlimitedPizza, "Pepperoni").inherits(Widget)({
       this._bandPassFilterNode.frequency.value = 2000;
       this._bandPassFilterNode.gain.value = 25;
 
       this._bandPassFilterNode.frequency.value = 2000;
       this._bandPassFilterNode.gain.value = 25;
 

+      requestHandler = function bufferFile(ev) {
+        var request = ev.target;
+        console.log("Reverb loading");
+        this.context.decodeAudioData(request.response, function(buffer){ 
+          console.log("Reverb loaded");
+          this._convolverNode.buffer = buffer;
+        }.bind(this));
+      }.bind(this);
+
+      request = new XMLHttpRequest();
+      request.open('GET', '/reverb.ogg', true);
+      request.responseType = 'arraybuffer';
+      request.addEventListener('load', requestHandler, false);
+      request.send();
+

       if (!this.source) {
         this._getUserMedia({
           audio : true
       if (!this.source) {
         this._getUserMedia({
           audio : true