comparison plugins/KeyDetect.cpp @ 251:73c9922fb649

Remove "rapid" option again. It changes the results completely in a way that only makes any sense if the only thing we're doing with it is taking the overall modal key

     Plugin(inputSampleRate),
     m_stepSize(0),
     m_blockSize(0),
     m_tuningFrequency(440),
     m_length(10),
-    m_rapid(true),
     m_getKeyMode(0),
     m_inputFrame(0),
     m_prevKey(-1)
 {
 }

     desc.defaultValue = 10;
     desc.isQuantized = true;
     desc.quantizeStep = 1;
     list.push_back(desc);
 
-    desc.identifier = "rapid";
-    desc.name = "Rapid";
-    desc.unit = "";
-    desc.description = "Sample intervals without overlap, for speed";
-    desc.minValue = 0;
-    desc.maxValue = 1;
-    desc.defaultValue = 1;
-    desc.isQuantized = true;
-    desc.quantizeStep = 1;
-    list.push_back(desc);
-
     return list;
 }
 
 float
 KeyDetector::getParameter(std::string param) const

     if (param == "tuning") {
         return m_tuningFrequency;
     }
     if (param == "length") {
         return float(m_length);
-    }
-    if (param == "rapid") {
-        return m_rapid ? 1.f : 0.f;
     }
     std::cerr << "WARNING: KeyDetector::getParameter: unknown parameter \""
               << param << "\"" << std::endl;
     return 0.0;
 }

 {
     if (param == "tuning") {
         m_tuningFrequency = value;
     } else if (param == "length") {
         m_length = int(value + 0.1);
-    } else if (param == "rapid") {
-        m_rapid = (value > 0.5);
     } else {
         std::cerr << "WARNING: KeyDetector::setParameter: unknown parameter \""
                   << param << "\"" << std::endl;
     }
 

 KeyDetector::getConfig() const
 {
     GetKeyMode::Config config(m_inputSampleRate, m_tuningFrequency);
     config.hpcpAverage = m_length;
     config.medianAverage = m_length;
-    config.frameOverlapFactor = (m_rapid ? 1 : 8);
+    config.frameOverlapFactor = 1;
     config.decimationFactor = 8;
     return config;
 }
 
 bool