comparison plugins/Notes.cpp @ 2:76c1a7bd0416

include math.h, add onset timestamps, fix default block and step sizes, switch to onset_complex and pitch_yinfft

     License, or (at your option) any later version.  See the file
     COPYING included with this distribution for more information.
 
 */
 
+#include <math.h>
 #include "Notes.h"
 
 using std::string;
 using std::vector;
 using std::cerr;

     m_fftgrain(0),
     m_onset(0),
     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),
     m_median(6)
 {

 }
 
 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
 Notes::getParameterDescriptors() const
 {

     ParameterDescriptor desc;
     desc.name = "onsettype";
     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");
     desc.valueNames.push_back("Spectral Difference");
     desc.valueNames.push_back("High-Frequency Content");

     desc = ParameterDescriptor();
     desc.name = "pitchtype";
     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");
     desc.valueNames.push_back("Spectral Comb");
     desc.valueNames.push_back("Schmitt");