bump to 1.1.4

FrequencyAnalyzer.md

@@ -57,7 +57,6 @@ The FrequencyAnalyzer class provides the following main functions:
 
 You can tweak the behaviour of this library with the following functions (you can also chain them when initializing your frequencyanalyzer object for clarity):
 * `.addMinim(minim)` mandatory to add the global minim object to the class.
-* `.setBandsPerOctave(6)` to get a total of 6 * 10 bands.
 * `.setFile("example.mp3")` to set the file for the audioplayer.
 * `.setAudioInputMode(AudioInputMode.AUDIO_FILE)` to set the input mode to AudioInputMode.AUDIO_FILE. You can also set it to AudioInputMode.LINE_IN or AudioInputMode.MICROPHONE. Defaults to AudioInputMode.MICROPHONE. 
 * `.setAudioOutputMode(AudioOutputMode.STEREO)` to set the output mode to AudioOutputMode.STEREO. Defaults to AudioOutputMode.MONO. Use it to get access to both left and right channel analysis.
@@ -69,7 +68,15 @@ You can tweak the behaviour of this library with the following functions (you ca
   * `CTRL + 2` switch to MONO mode
   * `CTRL + 3` switch to STEREO mode
   * `CTRL + M` toggle monitoring on LINE_IN or MICROPHONE input
-
+
+<!-- 
+  * `CTRL + R` reset the max value
+* `getAvg(2)` function that returns normalized value of the frequency band with index 2. The normalization mapping is done by continuously checking the highest overall amplitude.
+* `getAvg(2, 150)` function that returns normalized value of the frequency band with index 2, mapped with a max value of 150.
+* `resetMaxValue()` function that resets the overall max value (to 0.1f).
+* `.resetMaxValueDuration(2000)` to reset the max value every 2000 milliseconds.
+* `.setBandsPerOctave(6)` to get a total of 6 * 10 bands. 
+-->  
 
 ## Examples
 You can find all these examples in `Processing -> File - Examples - Contributed Libraries - BPM timings - FrequencyAnalyzer`.

README.md

@@ -192,6 +192,15 @@ ln -s ../../../src/bpm/library/frequencyanalyzer/AudioInputSource.java ./example
 ln -s ../../../src/bpm/library/frequencyanalyzer/MicrophoneInputSource.java ./examples/FrequencyAnalyzer/basics/MicrophoneInputSource.java
 ln -s ../../../src/bpm/library/frequencyanalyzer/LineInInputSource.java ./examples/FrequencyAnalyzer/basics/LineInInputSource.java
 ln -s ../../../src/bpm/library/InfoPanel.java ./examples/FrequencyAnalyzer/basics/InfoPanel.java
+
+ln -s ../../../src/bpm/library/frequencyanalyzer/FrequencyAnalyzer.java ./examples/FrequencyAnalyzer/audio_file/FrequencyAnalyzer.java
+ln -s ../../../src/bpm/library/frequencyanalyzer/AudioFileInputSource.java ./examples/FrequencyAnalyzer/audio_file/AudioFileInputSource.java
+ln -s ../../../src/bpm/library/frequencyanalyzer/AudioInputMode.java ./examples/FrequencyAnalyzer/audio_file/AudioInputMode.java
+ln -s ../../../src/bpm/library/frequencyanalyzer/AudioOutputMode.java ./examples/FrequencyAnalyzer/audio_file/AudioOutputMode.java
+ln -s ../../../src/bpm/library/frequencyanalyzer/AudioInputSource.java ./examples/FrequencyAnalyzer/audio_file/AudioInputSource.java
+ln -s ../../../src/bpm/library/frequencyanalyzer/MicrophoneInputSource.java ./examples/FrequencyAnalyzer/audio_file/MicrophoneInputSource.java
+ln -s ../../../src/bpm/library/frequencyanalyzer/LineInInputSource.java ./examples/FrequencyAnalyzer/audio_file/LineInInputSource.java
+ln -s ../../../src/bpm/library/InfoPanel.java ./examples/FrequencyAnalyzer/audio_file/InfoPanel.java
 ```
 BPM_Timing examples:
 ```

examples/FrequencyAnalyzer/stereo_output/AudioFileInputSource.java

@@ -0,0 +1 @@
+../../../src/bpm/library/frequencyanalyzer/AudioFileInputSource.java

examples/FrequencyAnalyzer/stereo_output/AudioInputMode.java

@@ -0,0 +1 @@
+../../../src/bpm/library/frequencyanalyzer/AudioInputMode.java

examples/FrequencyAnalyzer/stereo_output/AudioInputSource.java

@@ -0,0 +1 @@
+../../../src/bpm/library/frequencyanalyzer/AudioInputSource.java

examples/FrequencyAnalyzer/stereo_output/AudioOutputMode.java

@@ -0,0 +1 @@
+../../../src/bpm/library/frequencyanalyzer/AudioOutputMode.java

examples/FrequencyAnalyzer/stereo_output/FrequencyAnalyzer.java

@@ -0,0 +1 @@
+../../../src/bpm/library/frequencyanalyzer/FrequencyAnalyzer.java

examples/FrequencyAnalyzer/stereo_output/InfoPanel.java

@@ -0,0 +1 @@
+../../../src/bpm/library/InfoPanel.java

examples/FrequencyAnalyzer/stereo_output/LineInInputSource.java

@@ -0,0 +1 @@
+../../../src/bpm/library/frequencyanalyzer/LineInInputSource.java

examples/FrequencyAnalyzer/stereo_output/MicrophoneInputSource.java

@@ -0,0 +1 @@
+../../../src/bpm/library/frequencyanalyzer/MicrophoneInputSource.java

examples/FrequencyAnalyzer/stereo_output/stereo_output.pde

@@ -0,0 +1,29 @@
+// Import the library to your sketch
+import bpm.library.frequencyanalyzer.*;
+
+// Import the minim library
+import ddf.minim.*;
+import ddf.minim.analysis.*;
+
+Minim minim;
+FrequencyAnalyzer fa;
+
+void setup() {
+  size(500, 500);
+  minim = new Minim(this);
+
+  fa = new FrequencyAnalyzer(this)
+    .addMinim(minim)
+    .setFile("example-stereo.mp3")
+    .setAudioInputMode(AudioInputMode.AUDIO_FILE)
+    .setAudioOutputMode(AudioOutputMode.STEREO)
+    ;
+}
+
+
+void draw() {
+  background(50);
+
+  circle(width/3, height/2, fa.getAvgRawLeft(0)*30);
+  circle(width/3*2, height/2, fa.getAvgRawRight(0)*30);
+}

resources/build.properties

@@ -132,12 +132,12 @@ source.repository=https://github.com/vincentsijben/bpm-tmings-for-processing.git
 # This is used to compare different versions of the same Library, and check if 
 # an update is available.
 
-library.version=8
+library.version=9
 
 
 # The version as the user will see it.
 
-library.prettyVersion=1.1.3
+library.prettyVersion=1.1.4
 
 
 # The min and max revision of Processing compatible with your Library.

src/bpm/library/frequencyanalyzer/AudioFileInputSource.java

@@ -2,7 +2,7 @@
 
 import ddf.minim.*;
 import ddf.minim.analysis.*;
-
+//test
 class AudioFileInputSource implements AudioInputSource {
   Minim minim;
   FFT fftLeft, fftRight, fftMixed;

src/bpm/library/frequencyanalyzer/FrequencyAnalyzer.java

@@ -15,11 +15,7 @@ public class FrequencyAnalyzer {
   AudioInputSource currentInputSource;
   private AudioPlayer audioPlayer;
   private String file;
-  //private AudioInput audioInput;
-  //private AudioBuffer audioBufferMix;
-  //private AudioBuffer audioBufferLeftt;
-  //private AudioBuffer audioBufferRight;
-  private int bandsPerOctave;
+  // private int bandsPerOctave;
 
   private InfoPanel infoPanel;
   private AudioInputMode currentInputMode;
@@ -56,11 +52,11 @@ public FrequencyAnalyzer addMinim(Minim minim) {
     return this;
   }
 
-  public FrequencyAnalyzer setBandsPerOctave(int bandsPerOctave) {
-    this.bandsPerOctave = bandsPerOctave;
-    //this.fft.logAverages(22, bandsPerOctave ); // 3 results in 30 bands. 1 results in 10 etc.
-    return this;
-  }
+  //public FrequencyAnalyzer setBandsPerOctave(int bandsPerOctave) {
+  //  this.bandsPerOctave = bandsPerOctave;
+  //  //this.fft.logAverages(22, bandsPerOctave ); // 3 results in 30 bands. 1 results in 10 etc.
+  //  return this;
+  //}
 
   public FrequencyAnalyzer setFile(String file) {
     this.file = file;
@@ -99,10 +95,12 @@ public FrequencyAnalyzer setAudioInputMode(AudioInputMode newMode) {
       currentInputSource = new LineInInputSource(minim);
       break;
     case AUDIO_FILE:
+    if (this.file == null) System.out.println("no audio file was set");
+
       //currentInputSource = new AudioFileInputSource(minim, "https://github.com/vincentsijben/bpm-timings-for-processing/raw/main/assets/infraction_music_-_ritmo.mp3"); // Assuming an AudioFileSource class exists
       currentInputSource = new AudioFileInputSource(minim, this.file); // Assuming an AudioFileSource class exists
       //"stereotest.mp3"
-
+    
       break;
     }