Adjust includes for subrepo aubio

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

diff --git a/plugins/Notes.h b/plugins/Notes.h
index 723a81e..5bf32aa 100644 (file)
--- a/plugins/Notes.h
+++ b/plugins/Notes.h
@@ -18,7 +18,7 @@
 #define _NOTES_PLUGIN_H_
 
 #include <vamp-sdk/Plugin.h>
 #define _NOTES_PLUGIN_H_
 
 #include <vamp-sdk/Plugin.h>

-#include <aubio/aubio.h>
+#include <aubio.h>

 
 #include <deque>
 
 
 #include <deque>
 


@@ -58,16 +58,15 @@ public:
 
 protected:
     fvec_t *m_ibuf;
 
 protected:
     fvec_t *m_ibuf;

-    cvec_t *m_fftgrain;

     fvec_t *m_onset;
     fvec_t *m_onset;

-    aubio_pvoc_t *m_pv;
-    aubio_peakpicker_t *m_peakpick;
+    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;
     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_median;
     size_t m_stepSize;
     size_t m_blockSize;