# HG changeset patch
# User Chris Cannam
# Date 1416407191 0
# Node ID e8ab30f90e53146082417464582c32b1d8135268
# Parent  9be9182d432168492785bc3c6a92feee2a9635e7
Ensure eventual durations are set on Finder

diff -r 9be9182d4321 -r e8ab30f90e53 src/Finder.cpp
--- a/src/Finder.cpp	Wed Nov 19 14:14:52 2014 +0000
+++ b/src/Finder.cpp	Wed Nov 19 14:26:31 2014 +0000
@@ -163,8 +163,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;
@@ -172,6 +170,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 --
diff -r 9be9182d4321 -r e8ab30f90e53 src/MatchVampPlugin.cpp
--- 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);