Adjust includes for subrepo aubio
[vamp-aubio-plugins.git] / plugins / Notes.h
index c8141b9..5bf32aa 100644 (file)
 #define _NOTES_PLUGIN_H_
 
 #include <vamp-sdk/Plugin.h>
-#include <aubio/aubio.h>
+#include <aubio.h>
 
 #include <deque>
 
+#include "Types.h"
+
 class Notes : public Vamp::Plugin
 {
 public:
-    Notes(float inputSampleRate, unsigned int apiVersion);
+    Notes(float inputSampleRate);
     virtual ~Notes();
 
     bool initialise(size_t channels, size_t stepSize, size_t blockSize);
@@ -55,23 +57,19 @@ public:
     FeatureSet getRemainingFeatures();
 
 protected:
-    int m_apiVersion;
     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_pitchdetection_t *m_pitchdet;
-    aubio_pitchdetection_type m_pitchtype;
-    aubio_pitchdetection_mode m_pitchmode;
+    fvec_t *m_pitch;
+    aubio_onset_t *m_onsetdet;
+    OnsetType m_onsettype;
+    aubio_pitch_t *m_pitchdet;
+    PitchType m_pitchtype;
     float m_threshold;
     float m_silence;
+    float m_minioi;
     size_t m_median;
     size_t m_stepSize;
     size_t m_blockSize;
-    size_t m_channelCount;
     int m_minpitch;
     int m_maxpitch;
     bool m_wrapRange;