comparison framework/Align.h @ 671:b6cafe05017d tuning-difference

Make a completion figure available to alignment, + a couple of other fixes
author Chris Cannam
date Thu, 16 May 2019 15:55:46 +0100
parents 0960e27c3232
children 4d26b66931f8
comparison
equal deleted inserted replaced
670:0960e27c3232 671:b6cafe05017d
104 bool beginTransformDrivenAlignment(AggregateWaveModel *, 104 bool beginTransformDrivenAlignment(AggregateWaveModel *,
105 AlignmentModel *, 105 AlignmentModel *,
106 float tuningFrequency = 0.f); 106 float tuningFrequency = 0.f);
107 107
108 QMutex m_mutex; 108 QMutex m_mutex;
109
110 struct TuningDiffRec {
111 AggregateWaveModel *input;
112 AlignmentModel *alignment;
113 SparseTimeValueModel *preparatory;
114 };
115
116 // tuning-difference output model -> data needed for subsequent alignment
117 std::map<SparseTimeValueModel *, TuningDiffRec> m_pendingTuningDiffs;
118
119 // external alignment subprocess -> model into which to stuff the results
109 std::map<QProcess *, AlignmentModel *> m_pendingProcesses; 120 std::map<QProcess *, AlignmentModel *> m_pendingProcesses;
110 std::map<SparseTimeValueModel *,
111 std::pair<AggregateWaveModel *,
112 AlignmentModel *>> m_pendingTuningDiffs;
113 }; 121 };
114 122
115 #endif 123 #endif
116 124