Changeset eb089fb

Timestamp:

Oct 6, 2009, 5:03:23 PM (15 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:

b07ff1e

Parents:

422edfb

Message:

swig/aubio.i: update peakpicker interface, escape #if as needed

File:

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

swig/aubio.i

@@ -62 +62 @@
 
 /* sndfile */
-#if HAVE_SNDFILE
+%#if HAVE_SNDFILE
 extern aubio_sndfile_t * new_aubio_sndfile_ro (const char * inputfile);
 extern aubio_sndfile_t * new_aubio_sndfile_wo(aubio_sndfile_t * existingfile, const char * outputname);
@@ -71 +71 @@
 extern uint_t aubio_sndfile_channels(aubio_sndfile_t * file);
 extern uint_t aubio_sndfile_samplerate(aubio_sndfile_t * file);
-#endif /* HAVE_SNDFILE */
+%#endif /* HAVE_SNDFILE */
 
 /* fft */
@@ -181 +181 @@
 
 /* resampling */
-#if HAVE_LIBSAMPLERATE
+%#if HAVE_SAMPLERATE
 extern aubio_resampler_t * new_aubio_resampler(float ratio, uint_t type);
 extern uint_t aubio_resampler_process(aubio_resampler_t *s, fvec_t * input,  fvec_t * output);
 extern void del_aubio_resampler(aubio_resampler_t *s);
-#endif /* HAVE_LIBSAMPLERATE */
+%#endif /* HAVE_SAMPLERATE */
 
 /* onset detection */
@@ -271 +271 @@
 /* peakpicker */
 aubio_pickpeak_t * new_aubio_peakpicker(smpl_t threshold);
-smpl_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);
+smpl_t aubio_peakpicker_do(aubio_pickpeak_t * p, fvec_t * df);
+smpl_t aubio_peakpicker_get_thresholded_input(aubio_pickpeak_t* p);
 void del_aubio_peakpicker(aubio_pickpeak_t * p);
 void aubio_peakpicker_set_threshold(aubio_pickpeak_t * p, smpl_t threshold);