comparison transform/TransformFactory.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

                               description,
                               maker,
                               units,
                               configurable);
 	}
+
+        delete plugin;
     }
 }
 
 void
 TransformFactory::populateRealTimePlugins(TransformDescriptionMap &transforms)

     bool effect = false;
     bool generator = false;
 
     if (FeatureExtractionPluginFactory::instanceFor(id)) {
 
+        std::cerr << "getConfigurationForTransform: instantiating Vamp plugin" << std::endl;
+
         Vamp::Plugin *vp =
             FeatureExtractionPluginFactory::instanceFor(id)->instantiatePlugin
             (id, inputModel->getSampleRate());
 
         if (vp) {

 
         Vamp::Plugin *vp =
             FeatureExtractionPluginFactory::instanceFor(id)->instantiatePlugin
             (id, inputModel ? inputModel->getSampleRate() : 48000);
 
-        if (vp) context = PluginTransform::ExecutionContext(-1, vp);
-
+        if (vp) {
+            context = PluginTransform::ExecutionContext(-1, vp);
+            delete vp;
+        }
     }
 
     return context;
 }
 

                 model->setObjectName(imn);
             }
         } else if (trn != "") {
             model->setObjectName(trn);
         }
+    } else {
+        t->wait();
     }
 
     return model;
 }