diff transform/FeatureExtractionModelTransformer.cpp @ 1225:ba16388b937d piper

Restore native-Vamp factory and make the choice between Piper and Native a preference

--- a/transform/FeatureExtractionModelTransformer.cpp	Thu Oct 20 18:31:02 2016 +0100
+++ b/transform/FeatureExtractionModelTransformer.cpp	Fri Oct 21 11:49:27 2016 +0100
@@ -16,6 +16,9 @@
 #include "FeatureExtractionModelTransformer.h"
 
 #include "plugin/FeatureExtractionPluginFactory.h"
+#include "plugin/NativeVampPluginFactory.h"
+#include "plugin/PiperVampPluginFactory.h"
+
 #include "plugin/PluginXml.h"
 #include <vamp-hostsdk/Plugin.h>
 
@@ -92,8 +95,7 @@
 
     QString pluginId = primaryTransform.getPluginIdentifier();
 
-    FeatureExtractionPluginFactory *factory =
-	FeatureExtractionPluginFactory::instanceFor(pluginId);
+    FeatureExtractionPluginFactory *factory = PiperVampPluginFactory::instance();
 
     if (!factory) {
         m_message = tr("No factory available for feature extraction plugin id \"%1\" (unknown plugin type, or internal error?)").arg(pluginId);
@@ -731,9 +733,6 @@
 
         if (m_abandoned) break;
 
-    cerr << "calling process() from thread "
-         << QThread::currentThreadId() << endl;
-    
 	Vamp::Plugin::FeatureSet features = m_plugin->process
 	    (buffers, RealTime::frame2RealTime(blockFrame, sampleRate).toVampRealTime());