Changeset 9935735 for src

Timestamp:

Jul 12, 2006, 6:26:59 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:

bb20f87

Parents:

8f70a18

Message:

update fft deletion function
update fft deletion function

File:

• src/fft.c (modified) (4 diffs)

src/fft.c

@@ -47 +47 @@
 };
 
-static aubio_fft_t * aubio_fft_alloc(uint_t size);
-static void aubio_fft_free(aubio_fft_t *s);
-
-static aubio_fft_t * aubio_fft_alloc(uint_t size) {
+aubio_fft_t * new_aubio_fft(uint_t size) {
         aubio_fft_t * s = AUBIO_NEW(aubio_fft_t);
         /* allocate memory */
@@ -56 +53 @@
         s->out      = AUBIO_ARRAY(real_t,size);
         s->specdata = (fft_data_t*)fftw_malloc(sizeof(fft_data_t)*size);
-        return s;
-}
-
-static void aubio_fft_free(aubio_fft_t * s) { 
-        /* destroy data */
-        fftw_destroy_plan(s->pfw);
-        fftw_destroy_plan(s->pbw);
-        if (s->specdata)        fftw_free(s->specdata);
-        if (s->out)             AUBIO_FREE(s->out);
-        if (s->in )             AUBIO_FREE(s->in );
-}
-
-aubio_fft_t * new_aubio_fft(uint_t size) {
-        aubio_fft_t * s =(aubio_fft_t *)aubio_fft_alloc(size);
         /* create plans */
         s->pfw = fftw_plan_dft_r2c_1d(size, s->in,  s->specdata, FFTW_ESTIMATE);
@@ -77 +60 @@
 
 void del_aubio_fft(aubio_fft_t * s) {
-        aubio_fft_free(s);
-        AUBIO_FREE(s);
+        /* destroy data */
+        fftw_destroy_plan(s->pfw);
+        fftw_destroy_plan(s->pbw);
+        fftw_free(s->specdata);
+        AUBIO_FREE(s->out);
+        AUBIO_FREE(s->in );
+        AUBIO_FREE(s);
 }
 
@@ -162 +150 @@
                 AUBIO_FREE(fft->spec[i]);
         AUBIO_FREE(fft->spec);
-        aubio_fft_free(fft->fft);
+        del_aubio_fft(fft->fft);
         AUBIO_FREE(fft);        
 }