Changes in / [7873363:d7a104c]

Files:

• examples/Makefile.am (modified) (3 diffs)
• examples/aubiomfcc.c (deleted)
• src/Makefile.am (modified) (2 diffs)
• src/aubio.h (modified) (1 diff)
• src/filterbank.c (deleted)
• src/filterbank.h (deleted)
• src/mfcc.c (deleted)
• src/mfcc.h (deleted)
• swig/aubio.i (modified) (1 diff)
• tests/python/demo/plot_mfcc_filterbank.py (deleted)
• tests/python/filterbank.py (deleted)
• tests/python/filterbank_mfcc.txt (deleted)

examples/Makefile.am ¶

@@ -7 +7 @@
         aubioonset \
         aubiotrack \
-        aubionotes \
-        aubiomfcc
+        aubionotes
 
 noinst_PROGRAMS = \
@@ -20 +19 @@
 aubiotrack_SOURCES = aubiotrack.c utils.c
 aubioquiet_SOURCES = aubioquiet.c utils.c
-aubiomfcc_SOURCES = aubiomfcc.c utils.c
 
 aubioonset_LDADD = @JACK_LIBS@
@@ -26 +24 @@
 aubiotrack_LDADD = @JACK_LIBS@
 aubioquiet_LDADD = @JACK_LIBS@
-aubiomfcc_LDADD = @JACK_LIBS@

src/Makefile.am ¶

@@ -24 +24 @@
         onset.h \
         tempo.h \
-        filter.h \
-        filterbank.h \
-        mfcc.h
-
+        filter.h
 nodist_pkginclude_HEADERS = config.h
 
@@ -76 +73 @@
         tempo.h \
         filter.c \
-        filter.h \
-        filterbank.c \
-        filterbank.h \
-        mfcc.h \
-        mfcc.c 
+        filter.h
 
 AM_CFLAGS = @AUBIO_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@

src/aubio.h ¶

@@ -80 +80 @@
 #include "onset.h"
 #include "tempo.h"
-#include "filterbank.h"
-#include "mfcc.h"
 
 #ifdef __cplusplus

swig/aubio.i ¶

@@ -154 +154 @@
 smpl_t aubio_zero_crossing_rate(fvec_t * input);
 smpl_t aubio_spectral_centroid(cvec_t * spectrum, smpl_t samplerate);
-
-/* filterbank */
-aubio_filterbank_t * new_aubio_filterbank(uint_t win_s, uint_t channels);
-aubio_filterbank_t * new_aubio_filterbank_mfcc(uint_t n_filters, uint_t win_s, uint_t samplerate, smpl_t freq_min, smpl_t freq_max);
-void del_aubio_filterbank(aubio_filterbank_t * fb);
-void aubio_filterbank_do(aubio_filterbank_t * fb, cvec_t * in, fvec_t *out);
-fvec_t * aubio_filterbank_getchannel(aubio_filterbank_t * fb, uint_t channel);
-
-/* mfcc */
-aubio_mfcc_t * new_aubio_mfcc (uint_t win_s, uint_t samplerate, uint_t n_filters, uint_t n_coefs, smpl_t lowfreq, smpl_t highfreq, uint_t channels);
-void del_aubio_mfcc(aubio_mfcc_t *mf);
-void aubio_mfcc_do(aubio_mfcc_t *mf, cvec_t *in, fvec_t *out);
 
 /* scale */