Mercurial > hg > match-vamp

diff src/MatchVampPlugin.cpp @ 173:eeed3498fe96 refactors

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch structure
author Chris Cannam
date Fri, 06 Feb 2015 18:41:35 +0000
parents 31602361fb65 d6cdbd814c8c
children e0dc4675059c
line wrap: on
line diff
--- a/src/MatchVampPlugin.cpp	Thu Feb 05 11:53:23 2015 +0000
+++ b/src/MatchVampPlugin.cpp	Fri Feb 06 18:41:35 2015 +0000
@@ -208,6 +208,7 @@
     desc.valueNames.push_back("Long-term average");
     list.push_back(desc);
     desc.valueNames.clear();
+    desc.defaultValue = (float)m_defaultFcParams.silenceThreshold;
 
     desc.identifier = "metric";
     desc.name = "Distance metric";
@@ -659,12 +660,11 @@
 
     FeatureSet returnFeatures;
     
-    Finder *finder = m_pipeline->getFinder();
     std::vector<int> pathx;
     std::vector<int> pathy;
-    int len = finder->retrievePath(m_smooth, pathx, pathy);
+    int len = m_pipeline->retrievePath(m_smooth, pathx, pathy);
 
-    double cost = finder->getOverallCost();
+    double cost = m_pipeline->getOverallCost();
     Feature costFeature;
     costFeature.hasTimestamp = false;
     costFeature.values.push_back((float)cost);