Changeset 70585a5 for src

Timestamp:

Nov 21, 2007, 4:53:13 PM (17 years ago)

Author:

Paul Brossier <piem@piem.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:

66a1b955

Parents:

b050e8e (diff), 15b97d9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge from main branch

Location:

src

Files:

• fft.c (modified) (4 diffs)
• onsetdetection.c (modified) (1 diff)
• onsetdetection.h (modified) (1 diff)
• pitchyinfft.c (modified) (1 diff)

src/fft.c

@@ -46 +46 @@
   uint_t fft_size;
   real_t *in, *out;
-  fftw_plan   pfw, pbw;
+  fftw_plan pfw, pbw;
   fft_data_t * specdata;     /* complex spectral data */
   fvec_t * compspec;
@@ -61 +61 @@
   /* create plans */
 #ifdef HAVE_COMPLEX_H
-  s->fft_size = winsize/2+1;
+  s->fft_size = winsize/2 + 1;
   s->specdata = (fft_data_t*)fftw_malloc(sizeof(fft_data_t)*s->fft_size);
   s->pfw = fftw_plan_dft_r2c_1d(winsize, s->in,  s->specdata, FFTW_ESTIMATE);
@@ -102 +102 @@
     }
     fftw_execute(s->pfw);
-#if HAVE_COMPLEX_H
+#ifdef HAVE_COMPLEX_H
     compspec->data[i][0] = REAL(s->specdata[0]);
     for (j = 1; j < s->fft_size -1 ; j++) {
@@ -121 +121 @@
   const smpl_t renorm = 1./(smpl_t)s->winsize;
   for (i = 0; i < compspec->channels; i++) {
-#if HAVE_COMPLEX_H
+#ifdef HAVE_COMPLEX_H
     s->specdata[0] = compspec->data[i][0];
     for (j=1; j < s->fft_size - 1; j++) {

src/onsetdetection.c

@@ -284 +284 @@
 }
 
-void aubio_onsetdetection_free (aubio_onsetdetection_t *o){
-  del_aubio_onsetdetection(o);
-}
-
 void del_aubio_onsetdetection (aubio_onsetdetection_t *o){
 

src/onsetdetection.h

@@ -161 +161 @@
 */
 void del_aubio_onsetdetection(aubio_onsetdetection_t *o);
-/** deletion of an onset detection object (obsolete)
-
-  \param o onset detection object as returned by new_aubio_onsetdetection()
-
-*/
-void aubio_onsetdetection_free(aubio_onsetdetection_t *o);
-
 
 #ifdef __cplusplus

src/pitchyinfft.c

@@ -138 +138 @@
     }
   } else
-    return 0;
+    return 0.;
 }