Mercurial > hg > match-vamp
diff src/MatchFeeder.cpp @ 45:a1b7df871496 refactors
Replace char dist (inc dir in masked section) with float dist + separate dir
author | Chris Cannam |
---|---|
date | Thu, 13 Nov 2014 14:43:03 +0000 |
parents | 6a5d165e5ea4 |
children | 19a93b15fcc3 |
line wrap: on
line diff
--- a/src/MatchFeeder.cpp Thu Nov 13 13:59:41 2014 +0000 +++ b/src/MatchFeeder.cpp Thu Nov 13 14:43:03 2014 +0000 @@ -115,19 +115,19 @@ } else { switch (finder->getExpandDirection (pm1->m_frameCount-1, pm2->m_frameCount-1)) { - case ADVANCE_THIS: -// std::cerr << "finder says ADVANCE_THIS" << std::endl; + case Matcher::AdvanceThis: f1 = feed1(); break; - case ADVANCE_OTHER: -// std::cerr << "finder says ADVANCE_OTHER" << std::endl; + case Matcher::AdvanceOther: f2 = feed2(); break; - case ADVANCE_BOTH: -// std::cerr << "finder says ADVANCE_BOTH" << std::endl; + case Matcher::AdvanceBoth: f1 = feed1(); f2 = feed2(); break; + case Matcher::AdvanceNone: + cerr << "finder says AdvanceNone!" << endl; + break; } }