comparison framework/TransformUserConfigurator.cpp @ 529:7a3fa603190e 3.0-integration

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

     bool effect = false;
     bool generator = false;
 
     if (!plugin) return false;
 
-    if (FeatureExtractionPluginFactory::instanceFor(id)) {
+    if (RealTimePluginFactory::instanceFor(id)) {
+
+        RealTimePluginFactory *factory = RealTimePluginFactory::instanceFor(id);
+        const RealTimePluginDescriptor *desc = factory->getPluginDescriptor(id);
+
+        if (desc->audioInputPortCount > 0 && 
+            desc->audioOutputPortCount > 0 &&
+            !desc->isSynth) {
+            effect = true;
+        }
+
+        if (desc->audioInputPortCount == 0) {
+            generator = true;
+        }
+
+        if (output != "A") {
+            int outputNo = output.toInt();
+            if (outputNo >= 0 && outputNo < int(desc->controlOutputPortCount)) {
+                outputLabel = desc->controlOutputPortNames[outputNo].c_str();
+            }
+        }
+
+        RealTimePluginInstance *rtp =
+            static_cast<RealTimePluginInstance *>(plugin);
+
+        if (effect && source) {
+	    SVDEBUG << "Setting auditioning effect" << endl;
+            source->setAuditioningEffect(rtp);
+        }
+
+    } else {
 
         Vamp::Plugin *vp = static_cast<Vamp::Plugin *>(plugin);
 
 	frequency = (vp->getInputDomain() == Vamp::Plugin::FrequencyDomain);
 

 		    outputDescription = od[i].description.c_str();
 		    break;
 		}
 	    }
         }
-
-    } else if (RealTimePluginFactory::instanceFor(id)) {
-
-        RealTimePluginFactory *factory = RealTimePluginFactory::instanceFor(id);
-        const RealTimePluginDescriptor *desc = factory->getPluginDescriptor(id);
-
-        if (desc->audioInputPortCount > 0 && 
-            desc->audioOutputPortCount > 0 &&
-            !desc->isSynth) {
-            effect = true;
-        }
-
-        if (desc->audioInputPortCount == 0) {
-            generator = true;
-        }
-
-        if (output != "A") {
-            int outputNo = output.toInt();
-            if (outputNo >= 0 && outputNo < int(desc->controlOutputPortCount)) {
-                outputLabel = desc->controlOutputPortNames[outputNo].c_str();
-            }
-        }
-
-        RealTimePluginInstance *rtp =
-            static_cast<RealTimePluginInstance *>(plugin);
-
-        if (effect && source) {
-	    SVDEBUG << "Setting auditioning effect" << endl;
-            source->setAuditioningEffect(rtp);
-        }
-    }
-
+    }
+    
     int sourceChannels = 1;
     if (dynamic_cast<DenseTimeValueModel *>(inputModel)) {
 	sourceChannels = dynamic_cast<DenseTimeValueModel *>(inputModel)
 	    ->getChannelCount();
     }