diff options
author | Jamie Bullock <jamie@postlude.co.uk> | 2006-10-08 15:05:02 +0000 |
---|---|---|
committer | Jamie Bullock <jamie@postlude.co.uk> | 2006-10-08 15:05:02 +0000 |
commit | 2260b6a200016010fa9704dd3024d2c28b4fee74 (patch) | |
tree | 9f448fae5c1f0c894260ec417ddb17f3c60d87c5 /src/libxtract.c | |
parent | 89803e1f2ff7a54f0c8a6283d9b9f96e62a35af2 (diff) | |
download | LibXtract-2260b6a200016010fa9704dd3024d2c28b4fee74.tar.gz LibXtract-2260b6a200016010fa9704dd3024d2c28b4fee74.tar.bz2 LibXtract-2260b6a200016010fa9704dd3024d2c28b4fee74.zip |
Added XTRACT macro
Diffstat (limited to 'src/libxtract.c')
-rw-r--r-- | src/libxtract.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/src/libxtract.c b/src/libxtract.c index 0595113..b9a98ef 100644 --- a/src/libxtract.c +++ b/src/libxtract.c @@ -18,26 +18,8 @@ * USA. */ -/* libxtract - library for feature extraction from 1D vectors -Copyright (C) 2006 Jamie Bullock - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ - - #include "xtract/libxtract.h" +#define XTRACT int(*xtract[])(float *, int, void *, float *) = { /* xtract_scalar.h */ @@ -69,7 +51,7 @@ int(*xtract[])(float *, int, void *, float *) = { xtract_slope, xtract_lowest_match, xtract_hps, - xtract_f0, + xtract_f0, /* xtract_vector.h */ xtract_magnitude_spectrum, xtract_autocorrelation, @@ -86,3 +68,4 @@ int(*xtract[])(float *, int, void *, float *) = { xtract_decay_time, xtract_delta_feature }; + |