Fixing examples for mozilla summit.

Author: corbanbrook

dsp.js

@@ -145,9 +145,9 @@ DSP.LOW_SHELF = 7;   // H(s) = A * (s^2 + (sqrt(A)/Q)*s + A)/(A*s^2 + (sqrt(A)/Q
 DSP.HIGH_SHELF = 8;   // H(s) = A * (A*s^2 + (sqrt(A)/Q)*s + 1)/(s^2 + (sqrt(A)/Q)*s + A)
 
 // Biquad filter parameter types
-DSP.Q = 0;
-DSP.BW = 1;
-DSP.S = 2;
+DSP.Q = 1;
+DSP.BW = 2; // SHARED with BACKWARDS LOOP MODE
+DSP.S = 3;
 
 
 /** 
@@ -540,7 +540,6 @@ Oscillator = function Oscillator(type, frequency, amplitude, bufferSize, sampleR
   this.signal = new Float32Array(bufferSize);
   this.envelope = null;
 
-
   switch(parseInt(type)) {
     case DSP.TRIANGLE:
       this.func = Oscillator.Triangle;

examples/sampler.html

@@ -22,7 +22,7 @@
     <script>
       // Setup shared variables
       var sampleRate = 44100;
-      var bufferSize = 2048;
+      var bufferSize = 1024;
       var bufferTime = Math.floor(1000 / (sampleRate / bufferSize));
 
       var amplitude  = 0.1; // Default amplitude at 70%
@@ -52,42 +52,44 @@
         output.mozSetup(1, sampleRate, 1);
       }
 
-      var timePerWrite = 0;
       var programStart;
-      
+      var writeCount = 0; 
+
       var s = new Sampler('audio/intergalactic.ogg', bufferSize, sampleRate);
       s.envelope = new ADSR(0, 0, 1, Infinity, 0, sampleRate);
       s.envelope.disable(); // turn off so it does not auto trigger
 
       var audioWriter = function() {
         if (s.loaded) {
-          var startTime = (new Date()).getTime();        
-        
           if ( programStart === undefined ) {
              programStart = new Date();
           }
 
-          var additiveSignal;
-        
-          if ( s.envelope.isActive() ) {
-            s.generate();
-            additiveSignal = s.applyEnvelope();
-          }
-        
-          // Set the global osc object
-          if ( typeof  additiveSignal === 'undefined' ) {
-            additiveSignal = silence;
-          }
+          while ( (new Date() - programStart) / 1000 * sampleRate / bufferSize >= writeCount ) {
+            var additiveSignal;
+          
+            if ( s.envelope.isActive() ) {
+              s.generate();
+              additiveSignal = s.applyEnvelope();
+            }
+          
+            /*
+            // This makes it fall out of sync for some reason.
+            if ( typeof  additiveSignal === 'undefined' ) {
+              additiveSignal = silence;
+            }
+            */
 
-          // Flush buffer  
-          output.mozWriteAudio([]);
-        
-          // Write next audio frame
-          output.mozWriteAudio(additiveSignal);
+            // Flush buffer  
+            output.mozWriteAudio([]);
+          
+            if (additiveSignal) {
+              // Write next audio frame
+              output.mozWriteAudio(additiveSignal);
 
-          var endTime = (new Date()).getTime();
-        
-          timePerWrite = endTime - startTime;
+            }
+            writeCount++;
+          }
         }
       }
 
@@ -129,9 +131,9 @@
           var step = Math.floor(s.duration * sampleRate / width);
 
           noStroke();
-          beginShape();
           stroke(0, 100);
           fill(0, 50);
+          beginShape();
           for ( int i = 0; i < Math.floor(s.samples.length/step); i++) {
             if (s.samples[i*step] > 0) {
               vertex(i + width - s.samples.length/step, height/2 - s.samples[i*step] * 100);
@@ -226,7 +228,7 @@
       }
 
       void keyPressed() {
-        var semi;
+        var semi = undefined;
 
         if ( key == 'z' ) {   // C
           semi = 0;
@@ -303,7 +305,6 @@
         if (mouseButton == RIGHT) {
           s.playEnd = mouseX / width;
         }
-
       }
 
     </script>

examples/synthesizer.html

@@ -306,17 +306,18 @@
           oscPool = tmpPool;
 
           // Set the global osc object
-          if ( typeof mergedOsc != 'undefined' ) {
+          if ( typeof mergedOsc !== 'undefined' ) {
             osc = mergedOsc;
           } else {
             osc.signal = silence;
+            //osc.signal = undefined;
           }
 
           // Flush buffer  
           a.mozWriteAudio([]);
 
-          // Write next audio frame
-          a.mozWriteAudio(osc.signal);
+            // Write next audio frame
+            a.mozWriteAudio(osc.signal);
 
           writeCount++;
 
@@ -340,13 +341,14 @@
         osc = new Oscillator(osc1_waveform, 440, 0, bufferSize, sampleRate);
 
         setInterval(audioWriter, bufferTime); // start audioWriter timer        
+        frameRate(10);
       }
 
       void draw() {
         var startTime = (new Date()).getTime();
 
         int sequencerCol = Math.floor(sequencerStep) % 32;
-        background(0, 0, 30, 50);
+        background(0, 0, 30);
 
         var curCol = Math.floor(sequencerCol/2);
         var nextCol = (curCol + 1) % 17;