Changeset 26499e4 for examples/tests

Timestamp:

Jul 21, 2006, 8:35:24 PM (18 years ago)

Author:

Paul Brossier <piem@altern.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

3eb0cc3

Parents:

45c0f16

Message:

update test-fft to not use aubio_priv.h
update test-fft to not use aubio_priv.h

File:

• examples/tests/test-fft.c (modified) (4 diffs)

examples/tests/test-fft.c

@@ +1 @@
+#include <stdlib.h>
+#include <math.h>
+#include <complex.h>
+#include <aubio.h>
 
-#include "aubio_priv.h"
-#include <aubio.h>
+#define NEW_ARRAY(_t,_n)                (_t*)malloc((_n)*sizeof(_t))
+
 
 int main(){
@@ -14 +18 @@
         /* allocate fft and other memory space */
         aubio_fft_t * fft      = new_aubio_fft(win_s);      /* fft interface */
-        smpl_t * w             = AUBIO_ARRAY(smpl_t,win_s); /* window */
+        smpl_t * w             = NEW_ARRAY(smpl_t,win_s); /* window */
         /* complex spectral data */
-        fft_data_t ** spec      = AUBIO_ARRAY(fft_data_t*,channels); 
+        fft_data_t ** spec     = NEW_ARRAY(fft_data_t*,channels); 
         for (i=0; i < channels; i++)
-                spec[i] = AUBIO_ARRAY(fft_data_t,win_s);
+                spec[i] = NEW_ARRAY(fft_data_t,win_s);
         /* initialize the window (see mathutils.c) */
         aubio_window(w,win_s,aubio_win_hanningz);
@@ -35 +39 @@
         for (i=0; i < channels; i++) {
                 for (j=0; j<win_s/2+1; j++) {
-                        spec[i][j]  = CEXPC(I*aubio_unwrap2pi(fftgrain->phas[i][j]));
+                        spec[i][j]  = cexp(I*aubio_unwrap2pi(fftgrain->phas[i][j]));
                         spec[i][j] *= fftgrain->norm[i][j];
                 }
@@ -44 +48 @@
         del_fvec(out);
         del_cvec(fftgrain);
-        AUBIO_FREE(w);
+        free(w);
         del_aubio_fft(fft);
         for (i=0; i < channels; i++)
-                AUBIO_FREE(spec[i]);
-        AUBIO_FREE(spec); 
+                free(spec[i]);
+        free(spec); 
         aubio_cleanup();
         return 0;