aboutsummaryrefslogtreecommitdiff
path: root/src/xtract_globals_private.h
diff options
context:
space:
mode:
authorJamie Bullock <jamie@jamiebullock.com>2013-01-09 23:09:34 +0000
committerJamie Bullock <jamie@jamiebullock.com>2013-01-09 23:09:34 +0000
commit9c106a6004ffcfb55f0036535982fb118a3b2718 (patch)
tree87279a20edfd43c3cb761c8cd216bd9c7661e5b0 /src/xtract_globals_private.h
parent7982c434bb9f85f6a08d7353b63b7ee2a939e7ff (diff)
downloadLibXtract-9c106a6004ffcfb55f0036535982fb118a3b2718.tar.gz
LibXtract-9c106a6004ffcfb55f0036535982fb118a3b2718.tar.bz2
LibXtract-9c106a6004ffcfb55f0036535982fb118a3b2718.zip
implemented optimised FFT via the Accelerate framework. closes #5
Diffstat (limited to 'src/xtract_globals_private.h')
-rw-r--r--src/xtract_globals_private.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/xtract_globals_private.h b/src/xtract_globals_private.h
index b7c26e4..e643ab0 100644
--- a/src/xtract_globals_private.h
+++ b/src/xtract_globals_private.h
@@ -26,12 +26,7 @@
#ifndef XTRACT_GLOBALS_PRIVATE_H
#define XTRACT_GLOBALS_PRIVATE_H
-typedef struct xtract_ooura_data_
-{
- int *ooura_ip;
- double *ooura_w;
- bool initialised;
-} xtract_ooura_data;
+#include "fft.h"
#ifdef DEFINE_GLOBALS
#define GLOBAL
@@ -39,10 +34,17 @@ typedef struct xtract_ooura_data_
#define GLOBAL extern
#endif
+#ifdef USE_OOURA
GLOBAL struct xtract_ooura_data_ ooura_data_dct;
GLOBAL struct xtract_ooura_data_ ooura_data_mfcc;
GLOBAL struct xtract_ooura_data_ ooura_data_spectrum;
GLOBAL struct xtract_ooura_data_ ooura_data_autocorrelation_fft;
+#else
+GLOBAL xtract_vdsp_data vdsp_data_dct;
+GLOBAL xtract_vdsp_data vdsp_data_mfcc;
+GLOBAL xtract_vdsp_data vdsp_data_spectrum;
+GLOBAL xtract_vdsp_data vdsp_data_autocorrelation_fft;
+#endif
#endif /* Header guard */