Mercurial > hg > libxtract
changeset 158:069b2f719dd4
Merge pull request #13 from felixonmars/master
fix for automake 1.13
| author | Jamie Bullock <jamie@jamiebullock.com> |
|---|---|
| date | Fri, 15 Mar 2013 05:46:57 -0700 |
| parents | 32b78d95f7fd (diff) b25e9878c55a (current diff) |
| children | 71870680f7c1 |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/examples/simpletest/simpletest.c Fri Feb 08 19:50:27 2013 +0800 +++ b/examples/simpletest/simpletest.c Fri Mar 15 05:46:57 2013 -0700 @@ -50,7 +50,7 @@ } /* get the mean of the input */ - xtract[XTRACT_MEAN]((void *)&input, BLOCKSIZE, NULL, (void *)&mean); + xtract[XTRACT_MEAN](input, BLOCKSIZE, NULL, &mean); printf("\nInput mean = %.2f\n\n", mean); /* get the spectrum */ @@ -60,7 +60,7 @@ argd[3] = 0.f; /* No Normalisation */ xtract_init_fft(BLOCKSIZE, XTRACT_SPECTRUM); - xtract[XTRACT_SPECTRUM]((void *)&input, BLOCKSIZE, &argd[0], (void *)&spectrum[0]); + xtract[XTRACT_SPECTRUM](input, BLOCKSIZE, &argd[0], spectrum); /* print the spectral bins */ printf("\nSpectral bins:\n"); @@ -71,10 +71,10 @@ /* compute the MFCCs */ mel_filters.n_filters = MFCC_FREQ_BANDS; - mel_filters.filters = malloc(MFCC_FREQ_BANDS * sizeof(double *)); + mel_filters.filters = (double **)malloc(MFCC_FREQ_BANDS * sizeof(double *)); for(n = 0; n < MFCC_FREQ_BANDS; ++n) { - mel_filters.filters[n] = malloc(BLOCKSIZE * sizeof(double)); + mel_filters.filters[n] = (double *)malloc(BLOCKSIZE * sizeof(double)); } xtract_init_mfcc(BLOCKSIZE >> 1, SAMPLERATE >> 1, XTRACT_EQUAL_GAIN, MFCC_FREQ_MIN, MFCC_FREQ_MAX, mel_filters.n_filters, mel_filters.filters);