comparison src/fini.c @ 110:c8502708853b

- Improvements to SWIG bindings generation script
- Fixed omission in xtract_bark_coefficients that was causing the output to be complete b/s! This fixed bark_coeffs and loudness feature which depends on it
- Changes to descriptor API: added is_delta and id. id corresponds to value in xtract_features_ enum and is useful for programmatic conversions between id and name string.

 
 /* fini.c: Contains library destructor routine */
 
 #ifdef XTRACT_FFT
 #include <fftw3.h>
-#include "xtract_globals_private.h"
+//#include "xtract_globals_private.h"
+#include "xtract/libxtract.h"
 #endif
 
 #ifdef __GNUC__
 __attribute__((destructor)) void fini()
 #else
 void _fini()
 #endif
 {
 #ifdef XTRACT_FFT
-    if(fft_plans.spectrum_plan != NULL)
-        fftwf_destroy_plan(fft_plans.spectrum_plan);
-    if(fft_plans.autocorrelation_fft_plan_1 != NULL)
-        fftwf_destroy_plan(fft_plans.autocorrelation_fft_plan_1);
-    if(fft_plans.autocorrelation_fft_plan_2 != NULL)
-        fftwf_destroy_plan(fft_plans.autocorrelation_fft_plan_2);
-    if(fft_plans.dct_plan != NULL)
-        fftwf_destroy_plan(fft_plans.dct_plan);
-    fftwf_cleanup();
+xtract_free_fft();
+fftwf_cleanup();
 #endif
 }