Mercurial > hg > svcore

diff data/model/AggregateWaveModel.cpp @ 1770:dffc70996f54

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Correct some erroneous signal signatures
author Chris Cannam
date Fri, 19 Jul 2019 16:10:00 +0100
parents 87b4c596c0ef
children
line wrap: on
line diff
--- a/data/model/AggregateWaveModel.cpp	Thu Jul 18 14:42:24 2019 +0100
+++ b/data/model/AggregateWaveModel.cpp	Fri Jul 19 16:10:00 2019 +0100
@@ -59,6 +59,13 @@
                    << "channels (has " << rate << ", expected " << overallRate
                    << ")" << endl;
         }
+
+        connect(model.get(), SIGNAL(modelChanged(ModelId)),
+                this, SLOT(componentModelChanged(ModelId)));
+        connect(model.get(), SIGNAL(modelChangedWithin(ModelId, sv_frame_t, sv_frame_t)),
+                this, SLOT(componentModelChangedWithin(ModelId, sv_frame_t, sv_frame_t)));
+        connect(model.get(), SIGNAL(completionChanged(ModelId)),
+                this, SLOT(componentModelCompletionChanged(ModelId)));
     }
 }
 
@@ -228,21 +235,21 @@
 }
 
 void
-AggregateWaveModel::componentModelChanged()
+AggregateWaveModel::componentModelChanged(ModelId)
 {
-    emit modelChanged();
+    emit modelChanged(getId());
 }
 
 void
-AggregateWaveModel::componentModelChangedWithin(sv_frame_t start, sv_frame_t end)
+AggregateWaveModel::componentModelChangedWithin(ModelId, sv_frame_t start, sv_frame_t end)
 {
-    emit modelChangedWithin(start, end);
+    emit modelChangedWithin(getId(), start, end);
 }
 
 void
-AggregateWaveModel::componentModelCompletionChanged()
+AggregateWaveModel::componentModelCompletionChanged(ModelId)
 {
-    emit completionChanged();
+    emit completionChanged(getId());
 }
 
 void