diff 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
line wrap: on
line diff
--- a/framework/Align.h	Wed May 15 17:52:22 2019 +0100
+++ b/framework/Align.h	Thu May 16 15:55:46 2019 +0100
@@ -106,10 +106,18 @@
                                        float tuningFrequency = 0.f);
 
     QMutex m_mutex;
+
+    struct TuningDiffRec {
+        AggregateWaveModel *input;
+        AlignmentModel *alignment;
+        SparseTimeValueModel *preparatory;
+    };
+
+    // tuning-difference output model -> data needed for subsequent alignment
+    std::map<SparseTimeValueModel *, TuningDiffRec> m_pendingTuningDiffs;
+
+    // external alignment subprocess -> model into which to stuff the results
     std::map<QProcess *, AlignmentModel *> m_pendingProcesses;
-    std::map<SparseTimeValueModel *,
-             std::pair<AggregateWaveModel *,
-                       AlignmentModel *>> m_pendingTuningDiffs;
 };
 
 #endif