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

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

diff --git a/plugins/Pitch.h b/plugins/Pitch.h
index 9a0abb4..86c9b61 100644 (file)
--- a/plugins/Pitch.h
+++ b/plugins/Pitch.h
@@ -20,6 +20,8 @@
 #include <vamp-sdk/Plugin.h>
 #include <aubio/aubio.h>
 
+#include "Types.h"
+
 class Pitch : public Vamp::Plugin
 {
 public:
@@ -54,12 +56,16 @@ public:
 
 protected:
     fvec_t *m_ibuf;
-    aubio_pitchdetection_t *m_pitchdet;
-    aubio_pitchdetection_type m_pitchtype;
-    aubio_pitchdetection_mode m_pitchmode;
+    fvec_t *m_obuf;
+    aubio_pitch_t *m_pitchdet;
+    PitchType m_pitchtype;
+    float m_minfreq;
+    float m_maxfreq;
+    float m_silence;
+    bool m_wrapRange;
+
     size_t m_stepSize;
     size_t m_blockSize;
-    size_t m_channelCount;
 };