comparison align/Align.cpp @ 777:87d33e79855b pitch-align

Rename TransformAligner -> MATCHAligner. It is still specific to MATCH, and at this point I think it's simpler to leave it that way and reduce confusion with the TransformDTWAligner which is much more generic.
author Chris Cannam
date Thu, 25 Jun 2020 17:43:10 +0100
parents 32e66fcc4cb7
children b651dc5ff555
comparison
equal deleted inserted replaced
776:32e66fcc4cb7 777:87d33e79855b
13 */ 13 */
14 14
15 #include "Align.h" 15 #include "Align.h"
16 16
17 #include "LinearAligner.h" 17 #include "LinearAligner.h"
18 #include "TransformAligner.h" 18 #include "MATCHAligner.h"
19 #include "TransformDTWAligner.h" 19 #include "TransformDTWAligner.h"
20 #include "ExternalProgramAligner.h" 20 #include "ExternalProgramAligner.h"
21 21
22 #include "framework/Document.h" 22 #include "framework/Document.h"
23 23
135 case MATCHAlignmentWithPitchCompare: { 135 case MATCHAlignmentWithPitchCompare: {
136 136
137 bool withTuningDifference = 137 bool withTuningDifference =
138 (type == MATCHAlignmentWithPitchCompare); 138 (type == MATCHAlignmentWithPitchCompare);
139 139
140 aligner = make_shared<TransformAligner>(doc, 140 aligner = make_shared<MATCHAligner>(doc,
141 reference, 141 reference,
142 toAlign, 142 toAlign,
143 withTuningDifference); 143 withTuningDifference);
144 break; 144 break;
145 } 145 }
146 146
147 case SungNoteContourAlignment: 147 case SungNoteContourAlignment:
148 { 148 {
264 264
265 if (type == ExternalProgramAlignment) { 265 if (type == ExternalProgramAlignment) {
266 return ExternalProgramAligner::isAvailable 266 return ExternalProgramAligner::isAvailable
267 (getPreferredAlignmentProgram()); 267 (getPreferredAlignmentProgram());
268 } else { 268 } else {
269 return TransformAligner::isAvailable(); 269 return MATCHAligner::isAvailable();
270 } 270 }
271 } 271 }
272 272
273 void 273 void
274 Align::alignerComplete(ModelId alignmentModel) 274 Align::alignerComplete(ModelId alignmentModel)