Mercurial > hg > match-vamp

comparison src/MatchFeeder.cpp @ 45:a1b7df871496 refactors

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
44:c1112adfd270 45:a1b7df871496
113 // std::cerr << "pm2 too slopey" << std::endl; 113 // std::cerr << "pm2 too slopey" << std::endl;
114 f1 = feed1(); 114 f1 = feed1();
115 } else { 115 } else {
116 switch (finder->getExpandDirection 116 switch (finder->getExpandDirection
117 (pm1->m_frameCount-1, pm2->m_frameCount-1)) { 117 (pm1->m_frameCount-1, pm2->m_frameCount-1)) {
118 case ADVANCE_THIS: 118 case Matcher::AdvanceThis:
119 // std::cerr << "finder says ADVANCE_THIS" << std::endl;
120 f1 = feed1(); 119 f1 = feed1();
121 break; 120 break;
122 case ADVANCE_OTHER: 121 case Matcher::AdvanceOther:
123 // std::cerr << "finder says ADVANCE_OTHER" << std::endl;
124 f2 = feed2(); 122 f2 = feed2();
125 break; 123 break;
126 case ADVANCE_BOTH: 124 case Matcher::AdvanceBoth:
127 // std::cerr << "finder says ADVANCE_BOTH" << std::endl;
128 f1 = feed1(); 125 f1 = feed1();
129 f2 = feed2(); 126 f2 = feed2();
127 break;
128 case Matcher::AdvanceNone:
129 cerr << "finder says AdvanceNone!" << endl;
130 break; 130 break;
131 } 131 }
132 } 132 }
133 133
134 if (!f1.empty()) ff.f1.push_back(f1); 134 if (!f1.empty()) ff.f1.push_back(f1);