X-Git-Url: https://git.aubio.org/?p=vamp-aubio-plugins.git;a=blobdiff_plain;f=plugins%2FNotes.cpp;h=35f4be9720d743c2db8b859e774dc0c5dd7ad831;hp=0a64dceedce287912dc7504d4a7a75bdfaee8e1e;hb=e20f267267ec3610d3f5314906197fd2819e80c3;hpb=953a9e975b435a1d44a879c8086bca988f438bfd

diff --git a/plugins/Notes.cpp b/plugins/Notes.cpp
index 0a64dce..35f4be9 100644
--- a/plugins/Notes.cpp
+++ b/plugins/Notes.cpp
@@ -14,6 +14,7 @@
 
 */
 
+#include <math.h>
 #include "Notes.h"
 
 using std::string;
@@ -29,9 +30,9 @@ Notes::Notes(float inputSampleRate) :
     m_pv(0),
     m_peakpick(0),
     m_onsetdet(0),
-    m_onsettype(aubio_onset_mkl),
+    m_onsettype(aubio_onset_complex),
     m_pitchdet(0),
-    m_pitchtype(aubio_pitch_fcomb),
+    m_pitchtype(aubio_pitch_yinfft),
     m_pitchmode(aubio_pitchm_freq),
     m_threshold(0.3),
     m_silence(-90),
@@ -125,18 +126,13 @@ Notes::reset()
 size_t
 Notes::getPreferredStepSize() const
 {
-    if (m_onsettype == aubio_onset_energy ||
-        m_onsettype == aubio_onset_hfc) {
-        return 512;
-    } else {
-        return 128;
-    }
+    return 512;
 }
 
 size_t
 Notes::getPreferredBlockSize() const
 {
-    return getPreferredStepSize();
+    return 4*getPreferredStepSize();
 }
 
 Notes::ParameterList
@@ -149,7 +145,7 @@ Notes::getParameterDescriptors() const
     desc.description = "Onset Detection Function Type";
     desc.minValue = 0;
     desc.maxValue = 6;
-    desc.defaultValue = (int)aubio_onset_mkl;
+    desc.defaultValue = (int)aubio_onset_complex;
     desc.isQuantized = true;
     desc.quantizeStep = 1;
     desc.valueNames.push_back("Energy Based");
@@ -166,7 +162,7 @@ Notes::getParameterDescriptors() const
     desc.description = "Pitch Detection Function Type";
     desc.minValue = 0;
     desc.maxValue = 4;
-    desc.defaultValue = (int)aubio_pitch_fcomb;
+    desc.defaultValue = (int)aubio_pitch_yinfft;
     desc.isQuantized = true;
     desc.quantizeStep = 1;
     desc.valueNames.push_back("YIN Frequency Estimator");