comparison transform/FeatureExtractionModelTransformer.cpp @ 1225:ba16388b937d piper

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

 */
 
 #include "FeatureExtractionModelTransformer.h"
 
 #include "plugin/FeatureExtractionPluginFactory.h"
+#include "plugin/NativeVampPluginFactory.h"
+#include "plugin/PiperVampPluginFactory.h"
+
 #include "plugin/PluginXml.h"
 #include <vamp-hostsdk/Plugin.h>
 
 #include "data/model/Model.h"
 #include "base/Window.h"

 
     Transform primaryTransform = m_transforms[0];
 
     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);
 	return false;
     }

             getFrames(channelCount, blockFrame, blockSize, buffers);
         }
 
         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());
 
         if (m_abandoned) break;