Makefile.inc: move defaults up, set to sdk 2.5

[vamp-aubio-plugins.git] / plugins / Onset.h

diff --git a/plugins/Onset.h b/plugins/Onset.h
index 314e107..961b44c 100644 (file)
--- a/plugins/Onset.h
+++ b/plugins/Onset.h
@@ -20,6 +20,8 @@
 #include <vamp-sdk/Plugin.h>
 #include <aubio/aubio.h>
 
+#include "Types.h"
+
 class Onset : public Vamp::Plugin
 {
 public:
@@ -54,17 +56,14 @@ public:
 
 protected:
     fvec_t *m_ibuf;
-    cvec_t *m_fftgrain;
     fvec_t *m_onset;
-    aubio_pvoc_t *m_pv;
-    aubio_pickpeak_t *m_peakpick;
-    aubio_onsetdetection_t *m_onsetdet;
-    aubio_onsetdetection_type m_onsettype;
+    aubio_onset_t *m_onsetdet;
+    OnsetType m_onsettype;
     float m_threshold;
     float m_silence;
+    float m_minioi;
     size_t m_stepSize;
     size_t m_blockSize;
-    size_t m_channelCount;
     Vamp::RealTime m_delay;
     Vamp::RealTime m_lastOnset;
 };