From e70d41b16e0cb598a0160d66e63ef4ce7e6abf92 Mon Sep 17 00:00:00 2001 From: Jamie Bullock Date: Thu, 5 Oct 2006 16:59:51 +0000 Subject: Changed xtract_f0 to xtract_lowest_match --- src/libxtract.c | 3 ++- src/scalar.c | 11 +++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/libxtract.c b/src/libxtract.c index afd2581..0595113 100644 --- a/src/libxtract.c +++ b/src/libxtract.c @@ -67,8 +67,9 @@ int(*xtract[])(float *, int, void *, float *) = { xtract_odd_even_ratio, xtract_sharpness, xtract_slope, - xtract_f0, + xtract_lowest_match, xtract_hps, + xtract_f0, /* xtract_vector.h */ xtract_magnitude_spectrum, xtract_autocorrelation, diff --git a/src/scalar.c b/src/scalar.c index c082440..1cc3128 100644 --- a/src/scalar.c +++ b/src/scalar.c @@ -23,6 +23,7 @@ #include "xtract/libxtract.h" #include "math.h" +#include int xtract_mean(float *data, int N, void *argv, float *result){ @@ -324,7 +325,7 @@ int xtract_slope(float *data, int N, void *argv, float *result){ } -int xtract_f0(float *data, int N, void *argv, float *result){ +int xtract_lowest_match(float *data, int N, void *argv, float *result){ /* int n, M = N >> 1; float guess, error, minimum_error = 1000000, f0, freq; @@ -412,4 +413,10 @@ int xtract_hps(float *data, int N, void *argv, float *result){ free(product); } - + + +int xtract_f0(float *data, int N, void *argv, float *result){ + + NOT_IMPLEMENTED; + +} -- cgit v1.2.3