comparison align/TransformAligner.cpp @ 761:6429a164b7e1 pitch-align

Schedule alignments with a small delay to avoid too much UI unresponsiveness. Also overhaul error reporting to use signals throughout.

     TransformId tdId = getTuningDifferenceTransformName();
     return factory->haveTransform(id) &&
         (tdId == "" || factory->haveTransform(tdId));
 }
 
-bool
-TransformAligner::begin(QString &error)
+void
+TransformAligner::begin()
 {
     auto reference =
         ModelById::getAs<RangeSummarisableTimeValueModel>(m_reference);
     auto other =
         ModelById::getAs<RangeSummarisableTimeValueModel>(m_toAlign);
 
-    if (!reference || !other) return false;
+    if (!reference || !other) return;
 
     // This involves creating a number of new models:
     //
     // 1. an AggregateWaveModel to provide the mixdowns of the main
     // model and the new model in its two channels, as input to the

         
         if (beginAlignmentPhase()) {
             other->setAlignment(m_alignmentModel);
             m_document->addNonDerivedModel(m_alignmentModel);
         } else {
-            error = alignmentModel->getError();
+            QString error = alignmentModel->getError();
             ModelById::release(alignmentModel);
-            return false;
+            emit failed(m_toAlign, error);
+            return;
         }
 
     } else {
 
         // Have a tuning-difference transform id, so run it

 
         auto tuningDiffOutputModel =
             ModelById::getAs<SparseTimeValueModel>(m_tuningDiffOutputModel);
         if (!tuningDiffOutputModel) {
             SVCERR << "Align::alignModel: ERROR: Failed to create tuning-difference output model (no Tuning Difference plugin?)" << endl;
-            error = message;
             ModelById::release(alignmentModel);
-            return false;
+            emit failed(m_toAlign, message);
+            return;
         }
 
         other->setAlignment(m_alignmentModel);
         m_document->addNonDerivedModel(m_alignmentModel);
     

             (aggregateModel->getSampleRate(), 1);
         m_tuningDiffProgressModel = ModelById::add(progressModel);
         progressModel->setCompletion(0);
         alignmentModel->setPathFrom(m_tuningDiffProgressModel);
     }
-
-    return true;
 }
 
 void
 TransformAligner::tuningDifferenceCompletionChanged(ModelId tuningDiffOutputModelId)
 {
+    if (m_tuningDiffOutputModel.isNone()) {
+        // we're done, this is probably a spurious queued event
+        return;
+    }
+        
     if (tuningDiffOutputModelId != m_tuningDiffOutputModel) {
         SVCERR << "WARNING: TransformAligner::tuningDifferenceCompletionChanged: Model "
                << tuningDiffOutputModelId
                << " is not ours! (ours is "
                << m_tuningDiffOutputModel << ")" << endl;

     }
     
     int completion = 0;
     bool done = tuningDiffOutputModel->isReady(&completion);
 
+    SVDEBUG << "TransformAligner::tuningDifferenceCompletionChanged: model "
+            << m_tuningDiffOutputModel << ", completion = " << completion
+            << ", done = " << done << endl;
+    
     if (!done) {
         // This will be the completion the alignment model reports,
         // before the alignment actually begins. It goes up from 0 to
         // 99 (not 100!) and then back to 0 again when we start
         // calculating the actual path in the following phase