Merge pull request #286 from therewasaguy/p5SOUND

p5.sound update

Author: Lauren McCarthy

examples/addons/p5.sound/FFT_freqRange/sketch.js

@@ -1,6 +1,7 @@
 /**
- * Display the average amount of energy (amplitude) across 
- * a range of frequencies using the FFT methods analyze() and getFreq().
+ * Display the average amount of energy (amplitude) across a range
+ * of frequencies using the p5.FFT class and its methods analyze()
+ * and getFreq().
  * 
  * This example divides the frequency spectrum into eight bands.
  */
@@ -24,7 +25,7 @@ function setup() {
   noStroke();
   textAlign(CENTER);
 
-  fft = new FFT();
+  fft = new p5.FFT();
 
   p = createP(description);
   var p2 = createP('Description: Using getFreq(low, high) to measure amplitude within a range of frequencies.');
@@ -38,6 +39,7 @@ function draw() {
 
   // Generate 8 bars to represent 8 different frequency ranges
   for (var i = 0; i < 8; i++){
+    noStroke();
     fill((i*30) % 100 + 50, 195, (i*25 + 50) % 255 )
 
     // Each bar has a unique frequency range
@@ -51,13 +53,17 @@ function draw() {
     // Rectangle height represents the average value of this frequency range
     var h = -height + map(freqValue, 0, 255, height, 0);
     rect((i+1)*width/8 - width/8, height, width/8, h);
-
+    stroke(255);
     text( loFreq.toFixed(0) +' Hz - ' + hiFreq.toFixed(0)+' Hz', (i+1)*width/8 - width/8/2, 30);
   }
 }
 
 function keyPressed() {
-  soundFile.pause();
+  if (soundFile.isPlaying()){
+    soundFile.pause();
+  } else {
+    soundFile.play();
+  }
 }
 
 // Change description text if the song is loading, playing or paused

examples/addons/p5.sound/FFT_frequency_spectrum/sketch.js

@@ -1,6 +1,6 @@
 /**
  * This example draws the frequency spectrum of a sound by using
- * the FFT object's analyze() method.
+ * the p5.FFT object's analyze() method.
  * 
  * FFT is a Fast Fourier Transform function that calculates
  * amplitude across the frequency spectrum. The analyze() method returns
@@ -38,7 +38,7 @@ function setup() {
   // loop the sound file
   soundFile.loop();
 
-  fft = new FFT();
+  fft = new p5.FFT();
 
   // update description text
   p = createP(description);
@@ -96,5 +96,9 @@ function updateDescription() {
 
 // pause the song if a key is pressed
 function keyPressed() {
-  soundFile.pause();
+  if (soundFile.isPlaying()){
+    soundFile.pause();
+  } else {
+    soundFile.play();
+  }
 }

examples/addons/p5.sound/FFT_waveform/sketch.js

@@ -1,5 +1,5 @@
 /**
- * DEMO: Draw the waveform of a sound as it plays using FFT.waveform()
+ * DEMO: Draw the waveform of a sound as it plays using p5.FFT.waveform()
  */
 
 var soundFile;
@@ -26,9 +26,9 @@ function setup() {
    *    - Smoothing 
    *    - Length of the FFT's analyze/waveform array. Must be a power of two between 16 and 1024 (default).
    */
-  fft = new FFT(.99, fftBands);
+  fft = new p5.FFT(.99, fftBands);
 
-  p = createP('press any key to pause');
+  p = createP('press any key to pause / play');
 }
 
 function draw() {
@@ -50,5 +50,9 @@ function draw() {
 }
 
 function keyPressed() {
-  soundFile.pause();
+  if (soundFile.isPlaying() ) {
+    soundFile.pause();
+  } else {
+    soundFile.play();
+  }
 }

examples/addons/p5.sound/FFT_waveform_2/sketch.js

@@ -1,5 +1,5 @@
 /**
- * DEMO: Draw the waveform of a sound as it plays using FFT.waveform()
+ * DEMO: Draw the waveform of a sound as it plays using p5.FFT.waveform()
  */
 
 var soundFile;
@@ -12,7 +12,8 @@ var xOffset = 0;
 var waveform = [];
 
 function preload() {
-  soundFile = loadSound( ['../_files/lucky_dragons_-_power_melody.mp3','../_files/lucky_dragons_-_power_melody.ogg'] );
+  soundFormats('ogg', 'mp3');
+  soundFile = loadSound('../_files/lucky_dragons_-_power_melody');
 }
 
 function setup() {
@@ -27,7 +28,7 @@ function setup() {
   soundFile.loop();
 
   // Create an FFT object. Give it smoothing and fftSize
-  fft = new FFT(.99, fftSize);
+  fft = new p5.FFT(.99, fftSize);
   createP('Press spacebar to pause');
 }
 

examples/addons/p5.sound/PulseFFT/sketch.js

@@ -28,11 +28,11 @@ function setup() {
   ampSlider = createSlider(0.0, 100.0, amp*100);
 
 
-  pulse = new Pulse(freq);
+  pulse = new p5.Pulse(freq);
   pulse.amp(amp);
 
   // create an fft to analyze the audio
-  fft = new FFT();
+  fft = new p5.FFT();
 
   // begin sound
   toggleOsc();

examples/addons/p5.sound/amplitude_analysis/sketch.js

@@ -1,5 +1,5 @@
 /**
- * DEMO:  Use Amplitude (volume) to change the size of an ellipse
+ * DEMO:  Use p5.Amplitude (volume) to change the size of an ellipse
  */
 
 var size;
@@ -25,8 +25,8 @@ function setup() {
 
   soundFile.loop();
 
-  // create a new Amplitude. Optionally, give it a 'smoothing' value betw 0.0 and .999
-  amplitude = new Amplitude(smoothing);
+  // create a new p5.Amplitude. Optionally, give it a 'smoothing' value betw 0.0 and .999
+  amplitude = new p5.Amplitude(smoothing);
 
   // instruction text
   description = 'Spacebar: pause/unpause the loop. <br>Press "N" to toggle Normalize';
@@ -64,7 +64,11 @@ function keyPressed(e) {
 
   // spacebar pauses
   if (e.keyCode == 32) {
-    soundFile.pause();
+    if (soundFile.isPlaying()) {
+      soundFile.pause();
+    } else {
+      soundFile.play();
+    }
   }
 
   // 'n' keypress toggles normalize on/off

examples/addons/p5.sound/envelope/sketch.js

@@ -1,4 +1,4 @@
-// Attempting to convert Wilm's Envelope example from the Processing Handbook ex2
+// Adapting Wilm Thoben's Envelope example from the Processing Handbook ex2
 
 /*
 This sketch shows how to use envelopes and oscillators. Envelopes are pre-defined amplitude 
@@ -21,8 +21,9 @@ var env;
 var attackTime = 0.1;
 var attackLevel = 0.7;
 var decayTime = 0.3;
+var decayLevel = 0.2;
 var sustainTime = 0.1;
-var sustainLevel = 0.2;
+var sustainLevel = decayLevel;
 var releaseTime = 0.5;
 
 var midiSequence = [ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72 ]; 
@@ -39,11 +40,11 @@ function setup(){
 
   trigger = millis();
 
-  triOsc = new TriOsc();
+  triOsc = new p5.TriOsc();
   triOsc.amp(0);
   triOsc.start();
 
-  env = new Env(attackTime, attackLevel, decayTime, sustainLevel, sustainTime, releaseTime);
+  env = new p5.Env(attackTime, attackLevel, decayTime, decayLevel, sustainTime, sustainLevel, releaseTime);
   fill(0);
 }
 

examples/addons/p5.sound/envelopeOnOff/sketch.js

@@ -1,5 +1,5 @@
 /**
- *  Example: Create an Envelope to control oscillator amplitude.
+ *  Example: Create an Envelope (p5.Env) to control oscillator amplitude.
  *  Trigger the Attack portion of the envelope when the mouse is clicked.
  *  Trigger the Release when the mouse is released.
  */
@@ -11,8 +11,9 @@ var env;
 var attackTime = 0.1;
 var attackLevel = 0.7;
 var decayTime = 0.3;
+var decayLevel = 0.2;
 var sustainTime = 0.1;
-var sustainLevel = 0.2;
+var sustainLevel = decayLevel;
 var releaseTime = 0.5;
 var duration = 1000;
 // Set the note trigger
@@ -28,12 +29,13 @@ function setup(){
 
   trigger = millis();
 
-  triOsc = new TriOsc();
+  triOsc = new p5.TriOsc();
   triOsc.amp(0);
   triOsc.start();
 
-  env = new Env(attackTime, attackLevel, decayTime, sustainLevel, sustainTime, releaseTime);
+  env = new p5.Env(attackTime, attackLevel, decayTime, decayLevel, sustainTime, sustainLevel, releaseTime);
   fill(0);
+  createP('click mouse to triggerAttack, release mouse to triggerRelease')
 }
 
 function draw(){

examples/addons/p5.sound/loadSound_callback/sketch.js

@@ -4,17 +4,18 @@
 
 function setup() {
   createCanvas(400,200);
-  sample1 = loadSound(['../_files/Damscray_-_Dancing_Tiger_01.mp3', '../_files/Damscray_-_Dancing_Tiger_01.ogg'], soundReady);
+  soundFormats('ogg', 'mp3');
+  soundFile = loadSound('../_files/Damscray_-_Dancing_Tiger_01', soundReady);
 }
 
 function soundReady(){
-  sample1.rate(1.75);
-  sample1.loop();
+  soundFile.rate(1.75);
+  soundFile.loop();
 
-  text('File is ready!  Click to pause.', 50, 10);
+  text('File is ready!  Click to pause / unpause', 50, 10);
 
   // draw the waveform
-  peaks = sample1.getPeaks();
+  peaks = soundFile.getPeaks();
   beginShape();
   for (i = 0; i< peaks.length; i++){
     vertex(map(i, 0, peaks.length, 0, width), map(peaks[i], -1, 1, height, 0) );
@@ -23,5 +24,9 @@ function soundReady(){
 }
 
 function mousePressed(){
-  sample1.pause();
+  if (soundFile.isPlaying()){
+    soundFile.pause();
+  } else {
+    soundFile.play();
+  }
 }

examples/addons/p5.sound/loadSound_preload/sketch.js

@@ -3,19 +3,20 @@
 
 
 function preload(){
-  sample1 = loadSound(['../_files/Damscray_-_Dancing_Tiger_01.mp3', '../_files/Damscray_-_Dancing_Tiger_01.ogg']);
+  soundFormats('ogg', 'mp3');
+  soundFile = loadSound('../_files/Damscray_-_Dancing_Tiger_01');
 }
 
 function setup() {
   createCanvas(400,200);
 
-  text('File is ready!  Click to pause.', 50, 10);
+  text('File is ready!  Click to pause / play.', 50, 10);
 
-  sample1.rate(.8);
-  sample1.reverseBuffer();
-  sample1.loop();
+  soundFile.rate(.8);
+  soundFile.reverseBuffer();
+  soundFile.loop();
 
-  peaks = sample1.getPeaks();
+  peaks = soundFile.getPeaks();
   beginShape();
   for (i = 0; i< peaks.length; i++){
     vertex(map(i, 0, peaks.length, 0, width), map(peaks[i], -1, 1, height, 0) );
@@ -25,5 +26,9 @@ function setup() {
 }
 
 function mousePressed(){
-  sample1.pause();
+  if (soundFile.isPlaying()){
+    soundFile.pause();
+  } else {
+    soundFile.play();
+  }
 }