comparison align/TransformDTWAligner.h @ 768:1b1960009be6 pitch-align

Provide callback for output preprocessing before DTW, use it for freq-pitch conversion; use direct setting of completion on alignment models instead of creating fake outputs for completion only

 
 #include "Aligner.h"
 
 #include "transform/Transform.h"
 
+#include <functional>
+
 class AlignmentModel;
 class Document;
 
 class TransformDTWAligner : public Aligner
 {

     TransformDTWAligner(Document *doc,
                         ModelId reference,
                         ModelId toAlign,
                         Transform transform,
                         DTWType dtwType);
+    
+    TransformDTWAligner(Document *doc,
+                        ModelId reference,
+                        ModelId toAlign,
+                        Transform transform,
+                        DTWType dtwType,
+                        std::function<double(double)> outputPreprocessor);
 
     // Destroy the aligner, cleanly cancelling any ongoing alignment
     ~TransformDTWAligner();
 
     void begin() override;

     Document *m_document;
     ModelId m_reference;
     ModelId m_toAlign;
     ModelId m_referenceOutputModel;
     ModelId m_toAlignOutputModel;
-    ModelId m_alignmentProgressModel;
     ModelId m_alignmentModel;
-    bool m_referenceTransformComplete;
-    bool m_toAlignTransformComplete;
     Transform m_transform;
     DTWType m_dtwType;
     bool m_incomplete;
+    std::function<double(double)> m_outputPreprocessor;
 };
 
 #endif