back to SCPattern , added projection

[SugarCubes.git] / Audio.pde

diff --git a/Audio.pde b/Audio.pde
index 06390bc6f1ca874f45fc816e47e82b855e13ba49..def7d0e1062ba7697415cef9ce98298f0f64a937 100644 (file)
--- a/Audio.pde
+++ b/Audio.pde
@@ -35,12 +35,12 @@ public static class GraphicEQ {
     numBands = this.fft.avgSize();
     bandVals = new LinearEnvelope[numBands];
     for (int i = 0; i < bandVals.length; ++i) {
-      bandVals[i] = new LinearEnvelope(0, 0, 500).trigger();
+      (bandVals[i] = new LinearEnvelope(0, 0, 500)).trigger();
     }
   }
   
-  final float logTen = log(10);
-  public float log10(float val) {
+  static final float logTen = log(10);
+  public static float log10(float val) {
     return log(val) / logTen;
   }
   
@@ -57,7 +57,7 @@ public static class GraphicEQ {
     return avg;
   }
   
-  public void run(int deltaMs) {
+  public void run(double deltaMs) {
     fft.forward(lx.audioInput().mix);
     float zeroDBReference = pow(10, 100*(1-level.getValuef())/20.);
     float decibelRange = 12 + range.getValuef() * 60;
@@ -70,13 +70,13 @@ public static class GraphicEQ {
       float value = constrain(positiveDecibels / decibelRange, 0, 1);
       
       if (value > bandVals[i].getValuef()) {
-        bandVals[i].setEndVal(value, attack.getValuef() * 20).trigger();
+        bandVals[i].setRangeFromHereTo(value, attack.getValuef() * 20).trigger();
       }
     }
     for (LinearEnvelope band : bandVals) {
       band.run(deltaMs);
       if (!band.isRunning() && band.getValuef() > 0) {
-        band.setEndVal(0, release.getValuef() * 1600).trigger();
+        band.setRangeFromHereTo(0, release.getValuef() * 1600).trigger();
       }
     }    
   }