comparison MatchVampPlugin.cpp @ 32:37c0b59fd514

Expose smooth parameter through plugin

     m_stepTime(defaultStepTime),
     m_blockSize(2048),
     m_serialise(false),
     m_begin(true),
     m_locked(false),
+    m_smooth(true),
     m_params(inputSampleRate, defaultStepTime, m_blockSize),
     m_defaultParams(inputSampleRate, defaultStepTime, m_blockSize)
 {
     if (inputSampleRate < sampleRateMin) {
         std::cerr << "MatchVampPlugin::MatchVampPlugin: input sample rate "

     desc.maxValue = 60;
     desc.defaultValue = m_defaultParams.blockTime;
     desc.isQuantized = true;
     desc.quantizeStep = 1;
     desc.unit = "s";
+    list.push_back(desc);
+
+    desc.identifier = "smooth";
+    desc.name = "Smooth Path";
+    desc.description = "Smooth the path by replacing steps with diagonals";
+    desc.minValue = 0;
+    desc.maxValue = 1;
+    desc.defaultValue = 1;
+    desc.isQuantized = true;
+    desc.quantizeStep = 1;
+    desc.unit = "";
     list.push_back(desc);
 
     return list;
 }
 

         return m_params.useChromaFrequencyMap ? 1.0 : 0.0;
     } else if (name == "gradientlimit") {
         return m_params.maxRunCount;
     } else if (name == "zonewidth") {
         return m_params.blockTime;
+    } else if (name == "smooth") {
+        return m_smooth ? 1.0 : 0.0;
     }
     
     return 0.0;
 }
 

         m_params.useChromaFrequencyMap = (value > 0.5);
     } else if (name == "gradientlimit") {
         m_params.maxRunCount = int(value + 0.1);
     } else if (name == "zonewidth") {
         m_params.blockTime = value;
+    } else if (name == "smooth") {
+        m_smooth = (value > 0.5);
     }
 }
 
 size_t
 MatchVampPlugin::getPreferredStepSize() const

 MatchVampPlugin::getRemainingFeatures()
 {
     Finder *finder = feeder->getFinder();
     std::vector<int> pathx;
     std::vector<int> pathy;
-    int len = finder->retrievePath(true, pathx, pathy);
+    int len = finder->retrievePath(m_smooth, pathx, pathy);
     
     FeatureSet returnFeatures;
 
     int prevx = 0;
     int prevy = 0;