diff --git a/java/libraries/sound/examples/Analysis/AmplitudeRMS/AmplitudeRMS.pde b/java/libraries/sound/examples/Analysis/AmplitudeRMS/AmplitudeRMS.pde index f13746792..528b0df25 100644 --- a/java/libraries/sound/examples/Analysis/AmplitudeRMS/AmplitudeRMS.pde +++ b/java/libraries/sound/examples/Analysis/AmplitudeRMS/AmplitudeRMS.pde @@ -13,7 +13,7 @@ Amplitude rms; int scale=1; public void setup() { - size(350,350); + size(640,360); // Create and start the sound renderer stream = new Sound(this, 44100, 512); @@ -30,7 +30,7 @@ public void setup() { public void draw() { background(125,255,125); - // rms.process() return a value between 0 and 1. To adjust + // rms.analyze() return a value between 0 and 1. To adjust // the scaling and mapping of an ellipse we scale from 0 to 0.5 scale=int(map(rms.process(), 0, 0.5, 1, 350)); noStroke(); diff --git a/java/libraries/sound/examples/Analysis/FFTSpectrum/FFTSpectrum.pde b/java/libraries/sound/examples/Analysis/FFTSpectrum/FFTSpectrum.pde index 7bc9af57e..064aa925c 100644 --- a/java/libraries/sound/examples/Analysis/FFTSpectrum/FFTSpectrum.pde +++ b/java/libraries/sound/examples/Analysis/FFTSpectrum/FFTSpectrum.pde @@ -13,10 +13,10 @@ FFT fft; int scale=1; int bands=512; -float[] spec = new float[bands]; +float[] spectrum = new float[bands]; public void setup() { - size(bands,350); + size(bands,360); background(255); // Create and start the sound renderer @@ -35,7 +35,7 @@ public void setup() { public void draw() { background(255); - fft.process(spec); + fft.analyze(spectrum); for(int i = 0; i < bands; i++) { @@ -44,4 +44,3 @@ public void draw() { line( i, height, i, height - spec[i]*height*5 ); } } - diff --git a/java/libraries/sound/examples/processing_handbook/ex2/ex2.pde b/java/libraries/sound/examples/Demos/Envelopes/Envelopes.pde similarity index 99% rename from java/libraries/sound/examples/processing_handbook/ex2/ex2.pde rename to java/libraries/sound/examples/Demos/Envelopes/Envelopes.pde index 72f212f2d..0dc0379e4 100644 --- a/java/libraries/sound/examples/processing_handbook/ex2/ex2.pde +++ b/java/libraries/sound/examples/Demos/Envelopes/Envelopes.pde @@ -34,7 +34,7 @@ int trigger = millis(); int note=0; void setup() { - size(200, 200); + size(640, 360); background(255); //Create and start the Sound renderer diff --git a/java/libraries/sound/examples/Keyboard/keyboard.pde b/java/libraries/sound/examples/Demos/Keyboard/Keyboard.pde similarity index 98% rename from java/libraries/sound/examples/Keyboard/keyboard.pde rename to java/libraries/sound/examples/Demos/Keyboard/Keyboard.pde index 73b32f5eb..765470079 100644 --- a/java/libraries/sound/examples/Keyboard/keyboard.pde +++ b/java/libraries/sound/examples/Demos/Keyboard/Keyboard.pde @@ -17,7 +17,7 @@ int value[] = {0,0,0}; void setup(){ - size(500, 500); + size(640, 360); background(255); // Create a Sound renderer and an array of empty soundfiles @@ -43,9 +43,8 @@ void draw(){ void keyPressed() { for (int i=0; i < 3; i++) { value[i]=int(random(255)); - }; - - + } + switch(key){ case 'a': file[0].play(0.5, 1.0); diff --git a/java/libraries/sound/examples/Keyboard/data/1.aif b/java/libraries/sound/examples/Demos/Keyboard/data/1.aif similarity index 100% rename from java/libraries/sound/examples/Keyboard/data/1.aif rename to java/libraries/sound/examples/Demos/Keyboard/data/1.aif diff --git a/java/libraries/sound/examples/Keyboard/data/2.aif b/java/libraries/sound/examples/Demos/Keyboard/data/2.aif similarity index 100% rename from java/libraries/sound/examples/Keyboard/data/2.aif rename to java/libraries/sound/examples/Demos/Keyboard/data/2.aif diff --git a/java/libraries/sound/examples/Keyboard/data/3.aif b/java/libraries/sound/examples/Demos/Keyboard/data/3.aif similarity index 100% rename from java/libraries/sound/examples/Keyboard/data/3.aif rename to java/libraries/sound/examples/Demos/Keyboard/data/3.aif diff --git a/java/libraries/sound/examples/Keyboard/data/4.aif b/java/libraries/sound/examples/Demos/Keyboard/data/4.aif similarity index 100% rename from java/libraries/sound/examples/Keyboard/data/4.aif rename to java/libraries/sound/examples/Demos/Keyboard/data/4.aif diff --git a/java/libraries/sound/examples/Keyboard/data/5.aif b/java/libraries/sound/examples/Demos/Keyboard/data/5.aif similarity index 100% rename from java/libraries/sound/examples/Keyboard/data/5.aif rename to java/libraries/sound/examples/Demos/Keyboard/data/5.aif diff --git a/java/libraries/sound/examples/processing_handbook/ex3/ex3.pde b/java/libraries/sound/examples/Demos/Sampler/Sampler.pde similarity index 96% rename from java/libraries/sound/examples/processing_handbook/ex3/ex3.pde rename to java/libraries/sound/examples/Demos/Sampler/Sampler.pde index cf97cabc3..ecc7c5eae 100644 --- a/java/libraries/sound/examples/processing_handbook/ex3/ex3.pde +++ b/java/libraries/sound/examples/Demos/Sampler/Sampler.pde @@ -24,11 +24,11 @@ int[] playSound = {1,1,1,1,1}; int trigger; // This array holds the pixel positions of the rectangles which are drawn each event -int[] posx = {0, 100, 200, 300, 400}; +int[] posx = {0, 128, 256, 384, 512}; void setup(){ - size(500, 300); + size(640, 360); background(255); // Create a Sound renderer and an array of empty soundfiles @@ -63,7 +63,7 @@ void draw(){ fill(int(random(255)),int(random(255)),int(random(255))); noStroke(); // Draw the rect in the positions we defined earlier in posx - rect(posx[i], 50, 100, 200); + rect(posx[i], 50, 128, 260); // Choose a random index of the octave array rate = octave[int(random(0,5))]; // Play the soundfile from the array with the respective rate and loop set to false @@ -72,7 +72,7 @@ void draw(){ // Renew the indexes of playSound so that at the next event the order is different and randomized. playSound[i] = int(random(0,2)); - }; + } // Create a new triggertime in the future, with a random offset between 200 and 1000 milliseconds trigger = millis() + int(random(200,1000)); diff --git a/java/libraries/sound/examples/processing_handbook/ex3/data/1.aif b/java/libraries/sound/examples/Demos/Sampler/data/1.aif similarity index 100% rename from java/libraries/sound/examples/processing_handbook/ex3/data/1.aif rename to java/libraries/sound/examples/Demos/Sampler/data/1.aif diff --git a/java/libraries/sound/examples/processing_handbook/ex3/data/2.aif b/java/libraries/sound/examples/Demos/Sampler/data/2.aif similarity index 100% rename from java/libraries/sound/examples/processing_handbook/ex3/data/2.aif rename to java/libraries/sound/examples/Demos/Sampler/data/2.aif diff --git a/java/libraries/sound/examples/processing_handbook/ex3/data/3.aif b/java/libraries/sound/examples/Demos/Sampler/data/3.aif similarity index 100% rename from java/libraries/sound/examples/processing_handbook/ex3/data/3.aif rename to java/libraries/sound/examples/Demos/Sampler/data/3.aif diff --git a/java/libraries/sound/examples/processing_handbook/ex3/data/4.aif b/java/libraries/sound/examples/Demos/Sampler/data/4.aif similarity index 100% rename from java/libraries/sound/examples/processing_handbook/ex3/data/4.aif rename to java/libraries/sound/examples/Demos/Sampler/data/4.aif diff --git a/java/libraries/sound/examples/processing_handbook/ex3/data/5.aif b/java/libraries/sound/examples/Demos/Sampler/data/5.aif similarity index 100% rename from java/libraries/sound/examples/processing_handbook/ex3/data/5.aif rename to java/libraries/sound/examples/Demos/Sampler/data/5.aif diff --git a/java/libraries/sound/examples/processing_handbook/ex1/ex1.pde b/java/libraries/sound/examples/Demos/SineCluster/SineCluster.pde similarity index 100% rename from java/libraries/sound/examples/processing_handbook/ex1/ex1.pde rename to java/libraries/sound/examples/Demos/SineCluster/SineCluster.pde diff --git a/java/libraries/sound/examples/processing_handbook/ex5/ex5.pde b/java/libraries/sound/examples/Demos/Spectrum/Spectrum.pde similarity index 96% rename from java/libraries/sound/examples/processing_handbook/ex5/ex5.pde rename to java/libraries/sound/examples/Demos/Spectrum/Spectrum.pde index 40a478b47..a355e056b 100644 --- a/java/libraries/sound/examples/processing_handbook/ex5/ex5.pde +++ b/java/libraries/sound/examples/Demos/Spectrum/Spectrum.pde @@ -16,7 +16,7 @@ int bands=512; float[] spec = new float[bands]; public void setup() { - size(bands,350); + size(bands,360); background(255); // Create and start the sound renderer @@ -35,7 +35,7 @@ public void setup() { public void draw() { background(255); - fft.process(spec); + fft.analyze(spec); for(int i = 0; i < bands; i++) { @@ -44,4 +44,3 @@ public void draw() { line( i, height, i, height - spec[i]*height*5 ); } } - diff --git a/java/libraries/sound/examples/processing_handbook/ex5/data/beat.aiff b/java/libraries/sound/examples/Demos/Spectrum/data/beat.aiff similarity index 100% rename from java/libraries/sound/examples/processing_handbook/ex5/data/beat.aiff rename to java/libraries/sound/examples/Demos/Spectrum/data/beat.aiff diff --git a/java/libraries/sound/examples/Effects/Filter/BandPass/BandPass.pde b/java/libraries/sound/examples/Effects/Filter/BandPass/BandPass.pde index e7f9e422a..8abd9af06 100644 --- a/java/libraries/sound/examples/Effects/Filter/BandPass/BandPass.pde +++ b/java/libraries/sound/examples/Effects/Filter/BandPass/BandPass.pde @@ -12,7 +12,7 @@ BPF bandPass; float amp=0.0; void setup() { - size(350,350); + size(640,360); background(255); // Create and start the sound renderer and the noise generator @@ -20,7 +20,7 @@ void setup() { noise = new WhiteNoise(this); bandPass = new BPF(this); noise.play(0.5); - bandPass.play(noise, 100); + bandPass.process(noise, 100); } void draw() { diff --git a/java/libraries/sound/examples/Effects/Filter/HighPass/HighPass.pde b/java/libraries/sound/examples/Effects/Filter/HighPass/HighPass.pde index 546a86dd5..18a4089ba 100644 --- a/java/libraries/sound/examples/Effects/Filter/HighPass/HighPass.pde +++ b/java/libraries/sound/examples/Effects/Filter/HighPass/HighPass.pde @@ -12,7 +12,7 @@ HPF highPass; float amp=0.0; void setup() { - size(350,350); + size(640,360); background(255); // Create and start the sound renderer and the noise generator @@ -20,7 +20,7 @@ void setup() { noise = new WhiteNoise(this); highPass = new HPF(this); noise.play(0.5); - highPass.play(noise, 100); + highPass.process(noise, 100); } void draw() { diff --git a/java/libraries/sound/examples/Effects/Filter/LowPass/LowPass.pde b/java/libraries/sound/examples/Effects/Filter/LowPass/LowPass.pde index 663b16b9e..42a248002 100644 --- a/java/libraries/sound/examples/Effects/Filter/LowPass/LowPass.pde +++ b/java/libraries/sound/examples/Effects/Filter/LowPass/LowPass.pde @@ -13,7 +13,7 @@ LPF lowPass; float amp=0.0; void setup() { - size(350,350); + size(640,360); background(255); // Create and start the sound renderer and the noise generator @@ -21,10 +21,9 @@ void setup() { noise = new WhiteNoise(this); lowPass = new LPF(this); noise.play(0.5); - lowPass.play(noise, 100); + lowPass.process(noise, 100); } void draw() { - lowPass.freq(map(mouseX, 0, 350, 20, 10000)); } diff --git a/java/libraries/sound/examples/Effects/Variable_Delay/Variable_Delay.pde b/java/libraries/sound/examples/Effects/Variable_Delay/Variable_Delay.pde index 52ae04f8f..12ddd9844 100644 --- a/java/libraries/sound/examples/Effects/Variable_Delay/Variable_Delay.pde +++ b/java/libraries/sound/examples/Effects/Variable_Delay/Variable_Delay.pde @@ -9,7 +9,7 @@ SoundFile soundfile; Delay delay; void setup() { - size(350,350); + size(640,360); background(255); // Create and start the sound renderer @@ -30,24 +30,24 @@ void setup() { soundfile.loop(); // Patch the delay - delay.play(soundfile, 5); + delay.process(soundfile, 5); } void draw() { // Map mouseX from 0.25 to 4.0 for playback rate. 1 equals original playback // speed 2 is an octave up 0.5 is an octave down. - soundfile.rate(map(mouseX, 0, 350, 0.25, 4.0)); + soundfile.rate(map(mouseX, 0, width, 0.25, 4.0)); // Map mouseY from 0.2 to 1.0 for amplitude - soundfile.amp(map(mouseY, 0, 350, 0.2, 1.0)); + soundfile.amp(map(mouseY, 0, width, 0.2, 1.0)); // Map mouseY from -1.0 to 1.0 for left to right - soundfile.pan(map(mouseY, 0, 350, -1.0, 1.0)); + soundfile.pan(map(mouseY, 0, width, -1.0, 1.0)); // Map mouseY from 0.001 to 2.0 seconds for the delaytime - delay.time(map(mouseY, 0, 350, 0.001, 2.0)); + delay.time(map(mouseY, 0, width, 0.001, 2.0)); // Map mouseX from 0 to 0.8 for the delay feedback - delay.feedback(map(mouseX, 0, 350, 0.0, 0.8)); + delay.feedback(map(mouseX, 0, width, 0.0, 0.8)); } diff --git a/java/libraries/sound/examples/Oscillators/Noise/Noise.pde b/java/libraries/sound/examples/Noise/White/White.pde similarity index 82% rename from java/libraries/sound/examples/Oscillators/Noise/Noise.pde rename to java/libraries/sound/examples/Noise/White/White.pde index 85fa9dfd2..06277cdbc 100644 --- a/java/libraries/sound/examples/Oscillators/Noise/Noise.pde +++ b/java/libraries/sound/examples/Noise/White/White.pde @@ -11,7 +11,7 @@ WhiteNoise noise; float amp=0.0; void setup() { - size(350,350); + size(640, 360); background(255); // Create and start the sound renderer and the noise generator @@ -22,8 +22,8 @@ void setup() { void draw() { // Map mouseX from 0.0 to 1.0 for amplitude - noise.amp(map(mouseX, 0, 350, 0.0, 1.0)); + noise.amp(map(mouseX, 0, width, 0.0, 1.0)); // Map mouseY from -1.0 to 1.0 for left to right - noise.pan(map(mouseY, 0, 350, -1.0, 1.0)); + noise.pan(map(mouseY, 0, width, -1.0, 1.0)); } diff --git a/java/libraries/sound/examples/Oscillators/PulseWidth/PulseWidth.pde b/java/libraries/sound/examples/Oscillators/PulseWidth/PulseWidth.pde index b009dbb96..4a3027646 100644 --- a/java/libraries/sound/examples/Oscillators/PulseWidth/PulseWidth.pde +++ b/java/libraries/sound/examples/Oscillators/PulseWidth/PulseWidth.pde @@ -11,7 +11,7 @@ Sound stream; Pulse pulse; void setup() { - size(350,350); + size(640,360); background(255); // Create and start the sound renderer and the pulse wave oscillator @@ -30,4 +30,3 @@ void draw() { // Map mouseY from 0.0 to 0.5 for amplitude pulse.width(map(mouseY, 0, height, 0.0, 1.0)); } - diff --git a/java/libraries/sound/examples/Oscillators/SawWave/SawWave.pde b/java/libraries/sound/examples/Oscillators/SawWave/SawWave.pde index a39377e76..92f7034c9 100644 --- a/java/libraries/sound/examples/Oscillators/SawWave/SawWave.pde +++ b/java/libraries/sound/examples/Oscillators/SawWave/SawWave.pde @@ -10,7 +10,7 @@ Sound stream; SawOsc saw; void setup() { - size(350,350); + size(640, 360); background(255); // Create and start the sound renderer and the sine oscillator. diff --git a/java/libraries/sound/examples/Oscillators/SineWave/SineWave.pde b/java/libraries/sound/examples/Oscillators/SineWave/SineWave.pde index 3f1310491..e07ed3b6d 100644 --- a/java/libraries/sound/examples/Oscillators/SineWave/SineWave.pde +++ b/java/libraries/sound/examples/Oscillators/SineWave/SineWave.pde @@ -14,7 +14,7 @@ float amp=0.5; float pos; void setup() { - size(350,350); + size(640, 360); background(255); // Create and start the sound renderer and the sine oscillator. diff --git a/java/libraries/sound/examples/Oscillators/SqrWave/SqrWave.pde b/java/libraries/sound/examples/Oscillators/SqrWave/SqrWave.pde index 0c4597a6b..ac4ae9229 100644 --- a/java/libraries/sound/examples/Oscillators/SqrWave/SqrWave.pde +++ b/java/libraries/sound/examples/Oscillators/SqrWave/SqrWave.pde @@ -10,7 +10,7 @@ Sound stream; SqrOsc sqr; void setup() { - size(350,350); + size(640,360); background(255); // Create and start the sound renderer and the sine oscillator. diff --git a/java/libraries/sound/examples/Oscillators/TriWave/TriWave.pde b/java/libraries/sound/examples/Oscillators/TriWave/TriWave.pde index ec2ebefac..ee75a735b 100644 --- a/java/libraries/sound/examples/Oscillators/TriWave/TriWave.pde +++ b/java/libraries/sound/examples/Oscillators/TriWave/TriWave.pde @@ -10,7 +10,7 @@ Sound stream; TriOsc tri; void setup() { - size(350,350); + size(640,360); background(255); // Create and start the sound renderer and the sine oscillator. diff --git a/java/libraries/sound/examples/Soundfiles/Sample/Sample.pde b/java/libraries/sound/examples/Soundfile/Sample/Sample.pde similarity index 83% rename from java/libraries/sound/examples/Soundfiles/Sample/Sample.pde rename to java/libraries/sound/examples/Soundfile/Sample/Sample.pde index 3f5aa8278..57cb58879 100644 --- a/java/libraries/sound/examples/Soundfiles/Sample/Sample.pde +++ b/java/libraries/sound/examples/Soundfile/Sample/Sample.pde @@ -9,7 +9,7 @@ Sound stream; SoundFile soundfile; void setup() { - size(350,350); + size(640,360); background(255); // Create and start the sound renderer @@ -31,12 +31,11 @@ void setup() { void draw() { // Map mouseX from 0.25 to 4.0 for playback rate. 1 equals original playback // speed 2 is an octave up 0.5 is an octave down. - soundfile.rate(map(mouseX, 0, 350, 0.25, 4.0)); + soundfile.rate(map(mouseX, 0, width, 0.25, 4.0)); // Map mouseY from 0.2 to 1.0 for amplitude - soundfile.amp(map(mouseY, 0, 350, 0.2, 1.0)); + soundfile.amp(map(mouseY, 0, width, 0.2, 1.0)); // Map mouseY from -1.0 to 1.0 for left to right - soundfile.pan(map(mouseY, 0, 350, -1.0, 1.0)); + soundfile.pan(map(mouseY, 0, width, -1.0, 1.0)); } - diff --git a/java/libraries/sound/examples/Soundfiles/Sample/data/vibraphon.aiff b/java/libraries/sound/examples/Soundfile/Sample/data/vibraphon.aiff similarity index 100% rename from java/libraries/sound/examples/Soundfiles/Sample/data/vibraphon.aiff rename to java/libraries/sound/examples/Soundfile/Sample/data/vibraphon.aiff diff --git a/java/libraries/sound/src/processing/sound/Amplitude.java b/java/libraries/sound/src/processing/sound/Amplitude.java index 157594f13..56c8f010c 100644 --- a/java/libraries/sound/src/processing/sound/Amplitude.java +++ b/java/libraries/sound/src/processing/sound/Amplitude.java @@ -17,7 +17,7 @@ public class Amplitude { ptr = m_engine.amplitude(input.returnId()); } - public float process(){ + public float analyze(){ return m_engine.poll_amplitude(ptr); } /* diff --git a/java/libraries/sound/src/processing/sound/BPF.java b/java/libraries/sound/src/processing/sound/BPF.java index 109437f7c..d1ba09486 100644 --- a/java/libraries/sound/src/processing/sound/BPF.java +++ b/java/libraries/sound/src/processing/sound/BPF.java @@ -17,12 +17,12 @@ public class BPF implements SoundObject{ m_engine = new MethClaInterface(); } - public void play(SoundObject input, float freq, float res){ + public void process(SoundObject input, float freq, float res){ m_freq=freq; m_res=res; m_nodeId = m_engine.bandPassPlay(input.returnId(), m_freq, m_res); } - public void play(SoundObject input, float freq){ + public void process(SoundObject input, float freq){ m_freq=freq; m_nodeId = m_engine.bandPassPlay(input.returnId(), m_freq, m_res); } diff --git a/java/libraries/sound/src/processing/sound/Delay.java b/java/libraries/sound/src/processing/sound/Delay.java index c3b47084d..653b79728 100644 --- a/java/libraries/sound/src/processing/sound/Delay.java +++ b/java/libraries/sound/src/processing/sound/Delay.java @@ -18,17 +18,17 @@ public class Delay implements SoundObject{ m_engine = new MethClaInterface(); } - public void play(SoundObject input, float maxDelayTime, float delayTime, float feedBack){ + public void process(SoundObject input, float maxDelayTime, float delayTime, float feedBack){ m_maxDelayTime=maxDelayTime; m_delayTime=delayTime; m_feedBack=feedBack; m_nodeId = m_engine.delayPlay(input.returnId(), m_maxDelayTime, m_delayTime, m_feedBack); } - public void play(SoundObject input, float maxDelayTime, float delayTime){ + public void process(SoundObject input, float maxDelayTime, float delayTime){ m_maxDelayTime=maxDelayTime; m_delayTime=delayTime; m_nodeId = m_engine.delayPlay(input.returnId(), m_maxDelayTime, m_delayTime, m_feedBack); } - public void play(SoundObject input, float maxDelayTime){ + public void process(SoundObject input, float maxDelayTime){ m_maxDelayTime=maxDelayTime; m_nodeId = m_engine.delayPlay(input.returnId(), m_maxDelayTime, m_delayTime, m_feedBack); } diff --git a/java/libraries/sound/src/processing/sound/FFT.java b/java/libraries/sound/src/processing/sound/FFT.java index 2c3516a5d..cbf5baa30 100644 --- a/java/libraries/sound/src/processing/sound/FFT.java +++ b/java/libraries/sound/src/processing/sound/FFT.java @@ -17,7 +17,7 @@ public class FFT { ptr = m_engine.fft(input.returnId(), fftSize); } - public void process(float[] value){ + public void analyze(float[] value){ float[] m_value = m_engine.poll_fft(ptr); int num_samples = Math.min(value.length, m_value.length); for(int i=0; i