comparison framework/Align.cpp @ 677:4d26b66931f8

Abandon aggregate models on deletion (e.g. when document is replaced during processing)

 
         TuningDiffRec rec;
         rec.input = aggregateModel;
         rec.alignment = alignmentModel;
 
+        connect(aggregateModel, SIGNAL(aboutToBeDeleted()),
+                this, SLOT(aggregateModelAboutToBeDeleted()));
+        
         // This model exists only so that the AlignmentModel can get a
         // completion value from somewhere while the tuning difference
         // calculation is going on
         rec.preparatory = new SparseTimeValueModel
             (aggregateModel->getSampleRate(), 1);;

         
         m_pendingTuningDiffs[tdout] = rec;
     }
 
     return true;
+}
+
+void
+Align::aggregateModelAboutToBeDeleted()
+{
+    SVCERR << "Align::aggregateModelAboutToBeDeleted" << endl;
+
+    QObject *s = sender();
+    AggregateWaveModel *awm = qobject_cast<AggregateWaveModel *>(s);
+    if (!awm) return;
+    QMutexLocker locker(&m_mutex);
+
+    SVCERR << "Align::aggregateModelAboutToBeDeleted: awm = " << awm
+           << endl;
+
+    for (const auto &p : m_pendingTuningDiffs) {
+        if (p.second.input == awm) {
+            SVCERR << "we have a record of this, getting rid of it" << endl;
+            m_pendingTuningDiffs.erase(p.first);
+            return;
+        }
+    }
 }
 
 void
 Align::tuningDifferenceCompletionChanged()
 {