From 09bac0b1a09537dfa596ef7687518b2752074b53 Mon Sep 17 00:00:00 2001 From: wirsing Date: Mon, 21 Jul 2014 19:42:14 -0700 Subject: [PATCH] updated doc pdf, made interfaces non-public + added noise interface --- .../src/processing/sound/BrownNoise.java | 2 +- .../sound/src/processing/sound/Noise.java | 19 +++++++++++++++++++ .../src/processing/sound/Oscillator.java | 3 ++- .../sound/src/processing/sound/PinkNoise.java | 2 +- .../src/processing/sound/SoundObject.java | 2 +- .../src/processing/sound/WhiteNoise.java | 2 +- java/libraries/sound/todo.txt | 10 ++++++---- 7 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 java/libraries/sound/src/processing/sound/Noise.java diff --git a/java/libraries/sound/src/processing/sound/BrownNoise.java b/java/libraries/sound/src/processing/sound/BrownNoise.java index 2dfdf6576..74bbd80df 100644 --- a/java/libraries/sound/src/processing/sound/BrownNoise.java +++ b/java/libraries/sound/src/processing/sound/BrownNoise.java @@ -1,7 +1,7 @@ package processing.sound; import processing.core.*; -public class BrownNoise implements SoundObject{ +public class BrownNoise implements Noise{ PApplet parent; private Engine m_engine; diff --git a/java/libraries/sound/src/processing/sound/Noise.java b/java/libraries/sound/src/processing/sound/Noise.java new file mode 100644 index 000000000..78a6ac917 --- /dev/null +++ b/java/libraries/sound/src/processing/sound/Noise.java @@ -0,0 +1,19 @@ +package processing.sound; + +interface Noise extends SoundObject { + + public void play(float amp, float add, float pos); + public void play(float amp, float pos); + public void play(float amp); + public void play(); + + public void amp(float amp); + public void add(float add); + public void pan(float pos); + public void set(); + public void set(float amp, float add, float pan); + public void stop(); + public void dispose(); + + public int[] returnId(); +} diff --git a/java/libraries/sound/src/processing/sound/Oscillator.java b/java/libraries/sound/src/processing/sound/Oscillator.java index 94eb2f61d..b09f9fc0c 100644 --- a/java/libraries/sound/src/processing/sound/Oscillator.java +++ b/java/libraries/sound/src/processing/sound/Oscillator.java @@ -1,6 +1,6 @@ package processing.sound; -public interface Oscillator extends SoundObject { +interface Oscillator extends SoundObject { public void play(float freq, float amp, float add, float pos); public void play(float freq, float amp, float add); @@ -11,6 +11,7 @@ public interface Oscillator extends SoundObject { public void amp(float amp); public void add(float add); public void pan(float pos); + public void set(); public void set(float freq, float amp, float add, float pan); public void stop(); public void dispose(); diff --git a/java/libraries/sound/src/processing/sound/PinkNoise.java b/java/libraries/sound/src/processing/sound/PinkNoise.java index 45d557c9b..afccc8ced 100644 --- a/java/libraries/sound/src/processing/sound/PinkNoise.java +++ b/java/libraries/sound/src/processing/sound/PinkNoise.java @@ -1,7 +1,7 @@ package processing.sound; import processing.core.*; -public class PinkNoise implements SoundObject{ +public class PinkNoise implements Noise{ PApplet parent; private Engine m_engine; diff --git a/java/libraries/sound/src/processing/sound/SoundObject.java b/java/libraries/sound/src/processing/sound/SoundObject.java index 12b74f8be..4afa032a7 100644 --- a/java/libraries/sound/src/processing/sound/SoundObject.java +++ b/java/libraries/sound/src/processing/sound/SoundObject.java @@ -1,6 +1,6 @@ package processing.sound; -public interface SoundObject { +interface SoundObject { //public int numBusses=128; //public int topBus=0; diff --git a/java/libraries/sound/src/processing/sound/WhiteNoise.java b/java/libraries/sound/src/processing/sound/WhiteNoise.java index 4143b5399..b69f8cff5 100644 --- a/java/libraries/sound/src/processing/sound/WhiteNoise.java +++ b/java/libraries/sound/src/processing/sound/WhiteNoise.java @@ -1,7 +1,7 @@ package processing.sound; import processing.core.*; -public class WhiteNoise implements SoundObject{ +public class WhiteNoise implements Noise{ PApplet parent; private Engine m_engine; diff --git a/java/libraries/sound/todo.txt b/java/libraries/sound/todo.txt index a2837eb54..4c314a86d 100644 --- a/java/libraries/sound/todo.txt +++ b/java/libraries/sound/todo.txt @@ -2,17 +2,19 @@ 2.0 SOUND - FOR RELEASE + FOR RELEASE (GSoC) - Improve/make examples - Bugs: + Bugs (GSoC): + Fix FFT Crash - Fix Low Pass Distortion + Fix problem of passing effects to Analyzers + Make audio input work + - Use Patch Cables for signal splitting for effects - Features: + Features (GSoC): + - Compile Windows Version - Make oscillators modulatable - Bandlimit oscillators - Introduce wet/dry for Delay @@ -21,7 +23,7 @@ - If you loop a sample and use jump make it play from the beginning NICE - - Pitchtracker + - Pitchtracker (GSoC optional) - isPlaying method for Synths - helper functions (ampToDB, midiToFreq etc..) - make non-bandlimited a pro option