diff transform/PluginTransform.cpp @ 182:21a76c9ed5c3

* Merge transform directory from sv-match-alignment branch (the previous comment included notes for this stuff, but I missed it in the actual merge) * Fix crash when a transform fails to create an output model and the thread that created the transform then deletes its input model thinking it's no longer needed, even though the transform run thread is still using it -- fix is to wait() on the transform before returning the null output model
author Chris Cannam
date Fri, 28 Sep 2007 16:15:06 +0000
parents a65a01870d8c
children 1ded52c7f31c
line wrap: on
line diff
--- a/transform/PluginTransform.cpp	Fri Sep 28 14:32:45 2007 +0000
+++ b/transform/PluginTransform.cpp	Fri Sep 28 16:15:06 2007 +0000
@@ -30,7 +30,10 @@
     domain(Vamp::Plugin::TimeDomain),
     stepSize(_bs ? _bs : 1024),
     blockSize(_bs ? _bs : 1024),
-    windowType(HanningWindow)
+    windowType(HanningWindow),
+    startFrame(0),
+    duration(0),
+    sampleRate(0)
 {
 }
 
@@ -40,7 +43,10 @@
     domain(Vamp::Plugin::FrequencyDomain),
     stepSize(_ss ? _ss : (_bs ? _bs / 2 : 512)),
     blockSize(_bs ? _bs : 1024),
-    windowType(_wt)
+    windowType(_wt),
+    startFrame(0),
+    duration(0),
+    sampleRate(0)
 {
 }
 
@@ -50,7 +56,10 @@
     domain(Vamp::Plugin::TimeDomain),
     stepSize(0),
     blockSize(0),
-    windowType(HanningWindow)
+    windowType(HanningWindow),
+    startFrame(0),
+    duration(0),
+    sampleRate(0)
 {
     makeConsistentWithPlugin(_plugin);
 }
@@ -62,7 +71,10 @@
             c.domain == domain &&
             c.stepSize == stepSize &&
             c.blockSize == blockSize &&
-            c.windowType == windowType);
+            c.windowType == windowType &&
+            c.startFrame == startFrame &&
+            c.duration == duration &&
+            c.sampleRate == sampleRate);
 }
 
 void