From 4d6e986a6021f3fcd28897a1be215aa46177de4d Mon Sep 17 00:00:00 2001 From: wirsing Date: Fri, 27 Jun 2014 19:35:15 -0700 Subject: [PATCH] bugfixed --- .../sound/examples/Analysis/AmplitudeRMS/AmplitudeRMS.pde | 2 +- .../sound/examples/Analysis/FFTSpectrum/FFTSpectrum.pde | 2 +- java/libraries/sound/src/processing/sound/Pulse.java | 4 ++-- java/libraries/sound/src/processing/sound/SawOsc.java | 2 +- java/libraries/sound/src/processing/sound/SinOsc.java | 2 +- java/libraries/sound/src/processing/sound/SqrOsc.java | 2 +- java/libraries/sound/src/processing/sound/TriOsc.java | 2 +- java/libraries/sound/src/processing/sound/WhiteNoise.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/java/libraries/sound/examples/Analysis/AmplitudeRMS/AmplitudeRMS.pde b/java/libraries/sound/examples/Analysis/AmplitudeRMS/AmplitudeRMS.pde index 528b0df25..46b2fee98 100644 --- a/java/libraries/sound/examples/Analysis/AmplitudeRMS/AmplitudeRMS.pde +++ b/java/libraries/sound/examples/Analysis/AmplitudeRMS/AmplitudeRMS.pde @@ -32,7 +32,7 @@ public void draw() { // 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)); + scale=int(map(rms.analyze(), 0, 0.5, 1, 350)); noStroke(); fill(255,0,150); diff --git a/java/libraries/sound/examples/Analysis/FFTSpectrum/FFTSpectrum.pde b/java/libraries/sound/examples/Analysis/FFTSpectrum/FFTSpectrum.pde index 064aa925c..5945f923d 100644 --- a/java/libraries/sound/examples/Analysis/FFTSpectrum/FFTSpectrum.pde +++ b/java/libraries/sound/examples/Analysis/FFTSpectrum/FFTSpectrum.pde @@ -41,6 +41,6 @@ public void draw() { { // The result of the FFT is normalized // draw the line for frequency band i scaling it up by 5 to get more amplitude. - line( i, height, i, height - spec[i]*height*5 ); + line( i, height, i, height - spectrum[i]*height*5 ); } } diff --git a/java/libraries/sound/src/processing/sound/Pulse.java b/java/libraries/sound/src/processing/sound/Pulse.java index 711d11950..2fed96f46 100644 --- a/java/libraries/sound/src/processing/sound/Pulse.java +++ b/java/libraries/sound/src/processing/sound/Pulse.java @@ -8,8 +8,8 @@ public class Pulse implements SoundObject { MethClaInterface m_engine; private int[] m_nodeId = {-1,-1}; private float m_freq = 440; - private float m_width = 0.5; - private float m_amp = 0.5; + private float m_width = 0.5f; + private float m_amp = 0.5f; private float m_add = 0; private float m_pos = 0; diff --git a/java/libraries/sound/src/processing/sound/SawOsc.java b/java/libraries/sound/src/processing/sound/SawOsc.java index 1b11b2f09..387e9ecf2 100644 --- a/java/libraries/sound/src/processing/sound/SawOsc.java +++ b/java/libraries/sound/src/processing/sound/SawOsc.java @@ -8,7 +8,7 @@ public class SawOsc implements Oscillator{ private MethClaInterface m_engine; private int[] m_nodeId = {-1,-1}; private float m_freq = 440; - private float m_amp = 0.5; + private float m_amp = 0.5f; private float m_add = 0; private float m_pos = 0; diff --git a/java/libraries/sound/src/processing/sound/SinOsc.java b/java/libraries/sound/src/processing/sound/SinOsc.java index 48a5f6f07..7bf8a1134 100644 --- a/java/libraries/sound/src/processing/sound/SinOsc.java +++ b/java/libraries/sound/src/processing/sound/SinOsc.java @@ -7,7 +7,7 @@ public class SinOsc implements Oscillator { private MethClaInterface m_engine; private int[] m_nodeId = {-1,-1}; private float m_freq = 440; - private float m_amp = 0.5; + private float m_amp = 0.5f; private float m_add = 0; private float m_pos = 0; diff --git a/java/libraries/sound/src/processing/sound/SqrOsc.java b/java/libraries/sound/src/processing/sound/SqrOsc.java index b76b9263a..ec370208b 100644 --- a/java/libraries/sound/src/processing/sound/SqrOsc.java +++ b/java/libraries/sound/src/processing/sound/SqrOsc.java @@ -8,7 +8,7 @@ public class SqrOsc implements SoundObject { MethClaInterface m_engine; private int[] m_nodeId = {-1,-1}; private float m_freq = 440; - private float m_amp = 0.5; + private float m_amp = 0.5f; private float m_add = 0; private float m_pos = 0; diff --git a/java/libraries/sound/src/processing/sound/TriOsc.java b/java/libraries/sound/src/processing/sound/TriOsc.java index b9f64220b..90ba239f4 100644 --- a/java/libraries/sound/src/processing/sound/TriOsc.java +++ b/java/libraries/sound/src/processing/sound/TriOsc.java @@ -8,7 +8,7 @@ public class TriOsc implements Oscillator{ private MethClaInterface m_engine; private int[] m_nodeId = {-1,-1}; private float m_freq = 440; - private float m_amp = 0.5; + private float m_amp = 0.5f; private float m_add = 0; private float m_pos = 0; diff --git a/java/libraries/sound/src/processing/sound/WhiteNoise.java b/java/libraries/sound/src/processing/sound/WhiteNoise.java index ab99285e9..7757bc04a 100644 --- a/java/libraries/sound/src/processing/sound/WhiteNoise.java +++ b/java/libraries/sound/src/processing/sound/WhiteNoise.java @@ -6,7 +6,7 @@ public class WhiteNoise implements SoundObject{ PApplet parent; private MethClaInterface m_engine; private int[] m_nodeId = {-1,-1}; - private float m_amp=0.5; + private float m_amp=0.5f; private float m_add=0; private float m_pos=0;