Changeset 212da72 for swig/aubio.i

Timestamp:

Dec 3, 2007, 10:57:52 AM (17 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

45f1f06

Parents:

dddf1f5 (diff), 6913434 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge from main branch

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 */
@@ -168 +174 @@
 
 /* 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);
@@ -214 +220 @@
         aubio_pitch_schmitt,
         aubio_pitch_fcomb,
-        aubio_pitch_yinfft
+        aubio_pitch_yinfft
 } aubio_pitchdetection_type;
 
@@ -231 +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);
 
 
@@ -263 +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 */
@@ -475 +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);