Match JGaborator parameters

cgaborator.cpp

@@ -19,7 +19,7 @@ struct GaboratorState {
     float cArray[C_ARRAY_SIZE];
 };
 
-void* gaborator_initialize(double sampleRate, int bandsPerOctave, double minimumFrequency, double maximumFrequency, double referenceFrequency){
+void* gaborator_initialize(double sampleRate, int bandsPerOctave, double minimumFrequency, double referenceFrequency, double maximumFrequency){
 
     auto state = new GaboratorState();
 
@@ -52,6 +52,10 @@ long gaborator_get_anal_support(void* ptr) {
 void gaborator_analyze(void* ptr, float* audio_block, int audio_block_length) {
     auto state = reinterpret_cast<GaboratorState*>(ptr);
 
+    if (audio_block == nullptr) {
+        return;
+    }
+
     std::vector<float> buf(audio_block,audio_block + audio_block_length);
 
     int output_index = 0;
@@ -97,13 +101,12 @@ int gaborator_get_array_length(void* ptr) {
 int gaborator_bandcenters_array_length(void* ptr) {
     auto state = reinterpret_cast<GaboratorState*>(ptr);
     int max_band = state->analyzerRef->bandpass_bands_end();
-    return max_band+1;
+    return max_band;
 }
 
 void gaborator_bandcenters(void* ptr, float* band_centers) {
     auto state = reinterpret_cast<GaboratorState*>(ptr);
     int max_band = state->analyzerRef->bandpass_bands_end();
-    //band_centers = new float[max_band+1]; //TODO
 
     for(int i = 0 ; i < max_band ; i++){
         if(i<state->min_band){

include/cgaborator.h

@@ -3,7 +3,7 @@
 extern "C" {
 #endif
 
-void* gaborator_initialize(double sampleRate, int bandsPerOctave, double minimumFrequency, double maximumFrequency, double referenceFrequency);
+void* gaborator_initialize(double sampleRate, int bandsPerOctave, double minimumFrequency, double referenceFrequency, double maximumFrequency);
 long gaborator_get_anal_support(void* ptr);
 
 void gaborator_analyze(void* ptr, float* audio_block, int audio_block_length);

test.cpp

@@ -1,6 +1,5 @@
 #include "cgaborator.h"
 #include <cstdio>
-#include <iostream>
 
 #define BLOCK_SIZE 8192