diff options
| author | Jamie Bullock <jamie@postlude.co.uk> | 2006-10-20 12:30:46 +0000 |
|---|---|---|
| committer | Jamie Bullock <jamie@postlude.co.uk> | 2006-10-20 12:30:46 +0000 |
| commit | 26b8e9773d86c259b7faa2d20846ca5ac3862281 (patch) | |
| tree | 59645cf6472b11bb06fe4d60b7c42e3c205dc3d8 /src/libxtract.c | |
| parent | a642a56300874cabc18848d29d0b8cb882fa48db (diff) | |
| download | LibXtract-26b8e9773d86c259b7faa2d20846ca5ac3862281.tar.gz LibXtract-26b8e9773d86c259b7faa2d20846ca5ac3862281.tar.bz2 LibXtract-26b8e9773d86c259b7faa2d20846ca5ac3862281.zip | |
Replaced --enable-vector with --enable-fft and improved build
Diffstat (limited to 'src/libxtract.c')
| -rw-r--r-- | src/libxtract.c | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/src/libxtract.c b/src/libxtract.c index 14b089d..ad03ffc 100644 --- a/src/libxtract.c +++ b/src/libxtract.c @@ -54,23 +54,21 @@ int(*xtract[])(float *, int, void *, float *) = { xtract_lowest_match, xtract_hps, xtract_f0, - /* xtract_vector.h */ -#ifdef VECTORFUNCS - xtract_magnitude_spectrum, +/* xtract_delta.h */ + xtract_flux, + xtract_attack_time, + xtract_decay_time, + xtract_delta_feature, +/* xtract_vector.h */ xtract_autocorrelation, - xtract_autocorrelation_fft, xtract_amdf, xtract_asdf, - xtract_mfcc, - xtract_dct, xtract_bark_coefficients, xtract_peaks, -#endif - /* xtract_delta.h */ - xtract_flux, - xtract_attack_time, - xtract_decay_time, - xtract_delta_feature + xtract_magnitude_spectrum, + xtract_autocorrelation_fft, + xtract_mfcc, + xtract_dct }; char *xtract_help_strings[] = { @@ -104,17 +102,17 @@ char *xtract_help_strings[] = { "xtract_lowest_match", "xtract_hps", "xtract_f0", - "xtract_magnitude_spectrum", + "xtract_flux", + "xtract_attack_time", + "xtract_decay_time", + "xtract_delta_feature" "xtract_autocorrelation", - "xtract_autocorrelation_fft", "xtract_amdf", "xtract_asdf", - "xtract_mfcc", - "xtract_dct", "xtract_bark_coefficients", "xtract_peaks", - "xtract_flux", - "xtract_attack_time", - "xtract_decay_time", - "xtract_delta_feature" -}; + "xtract_magnitude_spectrum", + "xtract_autocorrelation_fft", + "xtract_mfcc", + "xtract_dct", + }; |