diff options
| author | Jamie Bullock <jamie@postlude.co.uk> | 2006-10-24 07:37:43 +0000 |
|---|---|---|
| committer | Jamie Bullock <jamie@postlude.co.uk> | 2006-10-24 07:37:43 +0000 |
| commit | e8dbc32c6c6124aa4a7b6a1ce8ebed6ae6402d5e (patch) | |
| tree | 24e843ede2a0ef82e9b4e313d37afcf695708863 | |
| parent | a25ee11531c3bb97996bf71627e3dcaa2b9647dd (diff) | |
| download | LibXtract-e8dbc32c6c6124aa4a7b6a1ce8ebed6ae6402d5e.tar.gz LibXtract-e8dbc32c6c6124aa4a7b6a1ce8ebed6ae6402d5e.tar.bz2 LibXtract-e8dbc32c6c6124aa4a7b6a1ce8ebed6ae6402d5e.zip | |
Various minor fixes
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | src/libxtract.c | 4 | ||||
| -rw-r--r-- | src/vector.c | 8 | ||||
| -rw-r--r-- | xtract/libxtract.h | 2 | ||||
| -rw-r--r-- | xtract/xtract_macros.h | 1 |
6 files changed, 17 insertions, 11 deletions
@@ -1,14 +1,19 @@ -2006-18-10 Jamie Bullock <jamie@postlude.co.uk> +2006-10-24 Jamie Bullock <jamie@postlude.co.uk> + * version 0.2.1 + * Fixed _xtract and _xtract_help_strings memory alloc bug + * Added new macro + _ +2006-10-18 Jamie Bullock <jamie@postlude.co.uk> * version 0.2.0 * added PD help files * added simple help system -2006-12-10 Jamie Bullock <jamie@postlude.co.uk> +2006-10-12 Jamie Bullock <jamie@postlude.co.uk> * version 0.1.2 * improved xtract_f0 * changed versioning scheme -2006-09-10 Jamie Bullock <jamie@postlude.co.uk> +2006-10-09 Jamie Bullock <jamie@postlude.co.uk> * Released version 0.11 diff --git a/configure.in b/configure.in index 69cc958..a653540 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ m4_define(libxtract_major_version, 0) # Increment for feature additions and enhancements m4_define(libxtract_minor_version, 2) # Increment for fixes -m4_define(libxtract_fix_version, 0) +m4_define(libxtract_fix_version, 1) m4_define(libxtract_version, libxtract_major_version.libxtract_minor_version.libxtract_fix_version) diff --git a/src/libxtract.c b/src/libxtract.c index ad03ffc..63abe49 100644 --- a/src/libxtract.c +++ b/src/libxtract.c @@ -105,7 +105,7 @@ char *xtract_help_strings[] = { "xtract_flux", "xtract_attack_time", "xtract_decay_time", - "xtract_delta_feature" + "xtract_delta_feature", "xtract_autocorrelation", "xtract_amdf", "xtract_asdf", @@ -114,5 +114,5 @@ char *xtract_help_strings[] = { "xtract_magnitude_spectrum", "xtract_autocorrelation_fft", "xtract_mfcc", - "xtract_dct", + "xtract_dct" }; diff --git a/src/vector.c b/src/vector.c index 8bc6f41..657a7ef 100644 --- a/src/vector.c +++ b/src/vector.c @@ -108,25 +108,25 @@ int xtract_dct(float *data, int N, void *argv, float *result){ int xtract_magnitude_spectrum(float *data, int N, void *argv, float *result){ - NOT_IMPLEMENTED; + NEEDS_FFTW; } int xtract_autocorrelation_fft(float *data, int N, void *argv, float *result){ - NOT_IMPLEMENTED; + NEEDS_FFTW; } int xtract_mfcc(float *data, int N, void *argv, float *result){ - NOT_IMPLEMENTED; + NEEDS_FFTW; } int xtract_dct(float *data, int N, void *argv, float *result){ - NOT_IMPLEMENTED; + NEEDS_FFTW; } diff --git a/xtract/libxtract.h b/xtract/libxtract.h index 235353e..5931351 100644 --- a/xtract/libxtract.h +++ b/xtract/libxtract.h @@ -53,7 +53,7 @@ extern "C" { * @{ */ -#define XTRACT_FEATURES 42 +#define XTRACT_FEATURES 43 #define LOG_LIMIT 10e-10 #define VERY_BIG_NUMBER 2e10 diff --git a/xtract/xtract_macros.h b/xtract/xtract_macros.h index 7cce4c0..534e1af 100644 --- a/xtract/xtract_macros.h +++ b/xtract/xtract_macros.h @@ -35,6 +35,7 @@ extern "C" { #define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MAX(a, b) ((a) > (b) ? (a) : (b)) #define NOT_IMPLEMENTED printf("Feature not implemented yet.\n") +#define NEEDS_FFTW printf("LibXtract must be compiled with fftw support to use this function.\n") #ifdef __cplusplus } |