changeset 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

--- a/plugins/KeyDetect.cpp	Fri Jan 17 10:46:44 2020 +0000
+++ b/plugins/KeyDetect.cpp	Fri Jan 17 10:59:04 2020 +0000
@@ -32,7 +32,6 @@
     m_blockSize(0),
     m_tuningFrequency(440),
     m_length(10),
-    m_rapid(true),
     m_getKeyMode(0),
     m_inputFrame(0),
     m_prevKey(-1)
@@ -110,17 +109,6 @@
     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;
 }
 
@@ -133,9 +121,6 @@
     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;
@@ -148,8 +133,6 @@
         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;
@@ -166,7 +149,7 @@
     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;
 }

--- a/plugins/KeyDetect.h	Fri Jan 17 10:46:44 2020 +0000
+++ b/plugins/KeyDetect.h	Fri Jan 17 10:59:04 2020 +0000
@@ -56,7 +56,6 @@
     mutable size_t m_blockSize;
     float m_tuningFrequency;
     int m_length;
-    bool m_rapid;
 
     GetKeyMode::Config getConfig() const;
     std::string getKeyName(int index, bool minor, bool includeMajMin) const;