Changeset f3bee79


Ignore:
Timestamp:
Oct 1, 2009, 5:41:07 PM (10 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, master, pitchshift, sampler, timestretch, yinfft+
Children:
847b374
Parents:
e6c11e3
Message:

src/spectral/fft.{c,h}: move fftw3.h include inside fft.c

Location:
src/spectral
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/spectral/fft.c

    re6c11e3 rf3bee79  
    2323#include "mathutils.h"
    2424#include "spectral/fft.h"
     25
     26/* note that <complex.h> is not included here but only in aubio_priv.h, so that
     27 * c++ projects can still use their own complex definition. */
     28#include <fftw3.h>
     29
     30#ifdef HAVE_COMPLEX_H
     31#if HAVE_FFTW3F
     32/** fft data type with complex.h and fftw3f */
     33#define FFTW_TYPE fftwf_complex
     34#else
     35/** fft data type with complex.h and fftw3 */
     36#define FFTW_TYPE fftw_complex
     37#endif
     38#else
     39#if HAVE_FFTW3F
     40/** fft data type without complex.h and with fftw3f */
     41#define FFTW_TYPE float
     42#else
     43/** fft data type without complex.h and with fftw */
     44#define FFTW_TYPE double
     45#endif
     46#endif
     47
     48/** fft data type */
     49typedef FFTW_TYPE fft_data_t;
    2550
    2651#if HAVE_FFTW3F
  • src/spectral/fft.h

    re6c11e3 rf3bee79  
    2727#define FFT_H_
    2828
    29 /* note that <complex.h> is not included here but only in aubio_priv.h, so that
    30  * c++ projects can still use their own complex definition. */
    31 #include <fftw3.h>
    32 
    33 #ifdef HAVE_COMPLEX_H
    34 #if HAVE_FFTW3F
    35 /** fft data type with complex.h and fftw3f */
    36 #define FFTW_TYPE fftwf_complex
    37 #else
    38 /** fft data type with complex.h and fftw3 */
    39 #define FFTW_TYPE fftw_complex
    40 #endif
    41 #else
    42 #if HAVE_FFTW3F
    43 /** fft data type without complex.h and with fftw3f */
    44 #define FFTW_TYPE float
    45 #else
    46 /** fft data type without complex.h and with fftw */
    47 #define FFTW_TYPE double
    48 #endif
    49 #endif
    50 
    5129#ifdef __cplusplus
    5230extern "C" {
    5331#endif
    54 
    55 /** fft data type */
    56 typedef FFTW_TYPE fft_data_t;
    5732
    5833/** FFT object
Note: See TracChangeset for help on using the changeset viewer.