Changes in swig/aubio.i [c7f32b1:a7667ce]

File:

• swig/aubio.i (modified) (6 diffs)

swig/aubio.i

@@ -86 +86 @@
 
 /* filter */
-extern aubio_filter_t * new_aubio_filter(uint_t samplerate, uint_t order);
-extern aubio_filter_t * new_aubio_adsgn_filter(uint_t samplerate);
-extern aubio_filter_t * new_aubio_cdsgn_filter(uint_t samplerate);
+extern aubio_filter_t * new_aubio_filter(uint_t samplerate, uint_t order, uint_t channels);
 extern void aubio_filter_do(aubio_filter_t * b, fvec_t * in);
 extern void aubio_filter_do_outplace(aubio_filter_t * b, fvec_t * in, fvec_t * out);
 extern void aubio_filter_do_filtfilt(aubio_filter_t * b, fvec_t * in, fvec_t * tmp);
-/*extern int del_aubio_filter(aubio_filter_t * b);*/
+extern void del_aubio_filter(aubio_filter_t * b);
+
+extern aubio_filter_t * new_aubio_adsgn_filter(uint_t samplerate, uint_t channels);
+extern void aubio_adsgn_filter_do(aubio_filter_t * b, fvec_t * in);
+extern void del_aubio_adsgn_filter(aubio_filter_t * b);
+
+extern aubio_filter_t * new_aubio_cdsgn_filter(uint_t samplerate, uint_t channels);
+extern void aubio_cdsgn_filter_do(aubio_filter_t * b, fvec_t * in);
+extern void del_aubio_cdsgn_filter(aubio_filter_t * b);
 
 /* biquad */
@@ -155 +161 @@
 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 */
-extern aubio_scale_t * new_aubio_scale(smpl_t flow, smpl_t fhig, smpl_t ilow, smpl_t ihig       );
+extern aubio_scale_t * new_aubio_scale(smpl_t flow, smpl_t fhig, smpl_t ilow, smpl_t ihig);
 extern void aubio_scale_set (aubio_scale_t *s, smpl_t ilow, smpl_t ihig, smpl_t olow, smpl_t ohig);
 extern void aubio_scale_do(aubio_scale_t *s, fvec_t * input);
@@ -202 +220 @@
         aubio_pitch_schmitt,
         aubio_pitch_fcomb,
-        aubio_pitch_yinfft
+        aubio_pitch_yinfft
 } aubio_pitchdetection_type;
 
@@ -219 +237 @@
 
 aubio_pitchdetection_t * new_aubio_pitchdetection(uint_t bufsize, 
-                uint_t hopsize, 
-                uint_t channels,
-                uint_t samplerate,
-                aubio_pitchdetection_type type,
-                aubio_pitchdetection_mode mode);
+    uint_t hopsize, 
+    uint_t channels,
+    uint_t samplerate,
+    aubio_pitchdetection_type type,
+    aubio_pitchdetection_mode mode);
 
 
@@ -251 +269 @@
 aubio_pickpeak_t * new_aubio_peakpicker(smpl_t threshold);
 uint_t aubio_peakpick_pimrt(fvec_t * DF, aubio_pickpeak_t * p);
+uint_t aubio_peakpick_pimrt_wt( fvec_t* DF, aubio_pickpeak_t* p, smpl_t* peakval );
 smpl_t aubio_peakpick_pimrt_getval(aubio_pickpeak_t* p);
-uint_t aubio_peakpick_pimrt_wt( fvec_t* DF, aubio_pickpeak_t* p, smpl_t* peakval );
 void del_aubio_peakpicker(aubio_pickpeak_t * p);
+void aubio_peakpicker_set_threshold(aubio_pickpeak_t * p, smpl_t threshold);
+smpl_t aubio_peakpicker_get_threshold(aubio_pickpeak_t * p);
 
 /* transient/steady state separation */
@@ -463 +483 @@
 sint_t aubio_midi_player_join(aubio_midi_player_t* player);
 sint_t aubio_track_send_events(aubio_track_t* track, 
-/*  aubio_synth_t* synth, */
-                           aubio_midi_player_t* player,
-                           uint_t ticks);
+    /*  aubio_synth_t* synth, */
+    aubio_midi_player_t* player,
+    uint_t ticks);
 sint_t aubio_midi_send_event(aubio_midi_player_t* player, aubio_midi_event_t* event);