From: Paul Brossier <piem@piem.org>
Date: Sun, 16 Sep 2007 16:26:40 +0000 (+0200)
Subject: remove dump_filterbank kludge, move aubio_dct_do to mfcc.c
X-Git-Tag: bzr2git~442^2~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=177f09a570a3e6338ed8d2d25b06f9fa67a079b3;p=aubio.git

remove dump_filterbank kludge, move aubio_dct_do to mfcc.c
---

diff --git a/src/mfcc.c b/src/mfcc.c
index 9ea21e57..b5cbd07f 100644
--- a/src/mfcc.c
+++ b/src/mfcc.c
@@ -87,6 +87,16 @@ void del_aubio_mfcc(aubio_mfcc_t *mf){
   AUBIO_FREE(mf);
 }
 
+
+/** intermediate dct involved in aubio_mfcc_do
+
+  \param mf mfcc object as returned by new_aubio_mfcc
+  \param in input spectrum (n_filters long)
+  \param out output mel coefficients buffer (n_filters/2 +1 long)
+
+*/
+void aubio_dct_do(aubio_mfcc_t * mf, fvec_t *in, fvec_t *out);
+
 void aubio_mfcc_do(aubio_mfcc_t * mf, cvec_t *in, fvec_t *out){
     // compute filterbank
     aubio_filterbank_do(mf->fb, in, mf->in_dct);
@@ -112,9 +122,3 @@ void aubio_dct_do(aubio_mfcc_t * mf, fvec_t *in, fvec_t *out){
     return;
 }
 
-//a bit a kludge
-void dump_filterbank(aubio_mfcc_t * mf){
-  aubio_dump_filterbank(mf->fb);
-
-}
-
diff --git a/src/mfcc.h b/src/mfcc.h
index cd7af856..6acc6cd2 100644
--- a/src/mfcc.h
+++ b/src/mfcc.h
@@ -60,22 +60,6 @@ void del_aubio_mfcc(aubio_mfcc_t *mf);
 */
 void aubio_mfcc_do(aubio_mfcc_t * mf, cvec_t *in, fvec_t *out);
 
-/** intermediate dct involved in aubio_mfcc_do
-
-  \param mf mfcc object as returned by new_aubio_mfcc
-  \param in input spectrum (n_filters long)
-  \param out output mel coefficients buffer (n_filters/2 +1 long)
-
-*/
-void aubio_dct_do(aubio_mfcc_t * mf, fvec_t *in, fvec_t *out);
-
-/** dump filterbank to log file
-
-  \param mf mfcc object as returned by new_aubio_mfcc
-  
-*/
-void dump_filterbank(aubio_mfcc_t * mf);
-
 #ifdef __cplusplus
 }
 #endif