From: Paul Brossier <piem@piem.org>
Date: Fri, 10 Mar 2017 13:26:32 +0000 (+0100)
Subject: Merge branch 'master' into awhitening
X-Git-Tag: 0.4.5~20^2~37
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=155cc10b5cde76184291c01fe8723328f0e36430;p=aubio.git

Merge branch 'master' into awhitening
---

155cc10b5cde76184291c01fe8723328f0e36430
diff --cc src/onset/onset.h
index 984d35cf,e7886037..17d061c5
--- a/src/onset/onset.h
+++ b/src/onset/onset.h
@@@ -115,25 -115,8 +115,25 @@@ smpl_t aubio_onset_get_last_s (const au
    \return onset detection timestamps (in milliseconds)
  
  */
- smpl_t aubio_onset_get_last_ms (aubio_onset_t *o);
+ smpl_t aubio_onset_get_last_ms (const aubio_onset_t *o);
  
 +/** set onset detection adaptive whitening
 +
 +  \param o onset detection object as returned by new_aubio_onset()
 +  \param apply_adaptive_whitening 1 to enable, 0 to disable
 +
 +*/
 +uint_t aubio_onset_set_adaptive_whitening(aubio_onset_t * o, uint_t apply_adaptive_whitening);
 +
 +/** get onset detection silence threshold
 +
 +  \param o onset detection object as returned by new_aubio_onset()
 +
 +  \return adaptive whitening mode, 1 if enabled, 0 otherwise
 +
 +*/
 +uint_t aubio_onset_get_adaptive_whitening(aubio_onset_t * o);
 +
  /** set onset detection silence threshold
  
    \param o onset detection object as returned by new_aubio_onset()