Mercurial > hg > match-vamp

changeset 77:eb3392bf6150 cheap_diagonals

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ensure eventual durations are set on Finder
author Chris Cannam
date Wed, 19 Nov 2014 14:26:31 +0000
parents 0042b4d42167
children d213254d79d3
files src/Finder.cpp src/MatchVampPlugin.cpp
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/Finder.cpp	Wed Nov 19 14:14:52 2014 +0000
+++ b/src/Finder.cpp	Wed Nov 19 14:26:31 2014 +0000
@@ -165,8 +165,6 @@
     
     int x = ex;
     int y = ey;
-    
-//    cerr << "before: x = " << x << ", y = " << y << endl;
 
     if (m_duration2 > 0 && m_duration2 < m_m->getOtherFrameCount()) {
         x = m_duration2 - 1;
@@ -174,6 +172,8 @@
     if (m_duration1 > 0 && m_duration1 < m_m->getFrameCount()) {
         y = m_duration1 - 1;
     }
+    
+//    cerr << "before: x = " << x << ", y = " << y << endl;
 
     if (!m_m->isAvailable(y, x)) {
         // Path did not pass through the expected end point --
--- a/src/MatchVampPlugin.cpp	Wed Nov 19 14:14:52 2014 +0000
+++ b/src/MatchVampPlugin.cpp	Wed Nov 19 14:26:31 2014 +0000
@@ -545,6 +545,7 @@
     FeatureSet returnFeatures;
     
     Finder *finder = m_feeder->getFinder();
+    finder->setDurations(m_lastFrameIn1, m_lastFrameIn2);
     std::vector<int> pathx;
     std::vector<int> pathy;
     int len = finder->retrievePath(m_smooth, pathx, pathy);