diff data/model/AlignmentModel.h @ 1688:901f37d32060

Model deletion issues - the AlignmentModel doesn't actually need to know about the input aggregate model; the document should own it instead
author Chris Cannam
date Thu, 04 Apr 2019 11:15:43 +0100
parents ad5f892c0c4d
children d08b560102a1
line wrap: on
line diff
--- a/data/model/AlignmentModel.h	Wed Feb 27 12:31:12 2019 +0000
+++ b/data/model/AlignmentModel.h	Thu Apr 04 11:15:43 2019 +0100
@@ -32,8 +32,7 @@
 public:
     AlignmentModel(Model *reference,
                    Model *aligned,
-                   Model *inputModel, // probably an AggregateWaveModel; may be null; I take ownership
-                   SparseTimeValueModel *path); // I take ownership
+                   SparseTimeValueModel *path);
     ~AlignmentModel();
 
     bool isOK() const override;
@@ -72,8 +71,6 @@
     Model *m_reference; // I don't own this
     Model *m_aligned; // I don't own this
 
-    Model *m_inputModel; // I own this
-
     SparseTimeValueModel *m_rawPath; // I own this
     mutable PathModel *m_path; // I own this
     mutable PathModel *m_reversePath; // I own this