diff transform/ModelTransformerFactory.cpp @ 516:5ab561f664f2

* make it possible to avoid pulling in widgets for non-gui (i.e. runner) build
author Chris Cannam
date Thu, 11 Dec 2008 11:04:01 +0000
parents a70dcfed59c1
children 12578237b99c
line wrap: on
line diff
--- a/transform/ModelTransformerFactory.cpp	Wed Dec 10 16:24:31 2008 +0000
+++ b/transform/ModelTransformerFactory.cpp	Thu Dec 11 11:04:01 2008 +0000
@@ -26,7 +26,9 @@
 #include "plugin/RealTimePluginFactory.h"
 #include "plugin/PluginXml.h"
 
+#ifndef NO_SV_GUI
 #include "widgets/PluginParameterDialog.h"
+#endif
 
 #include "data/model/DenseTimeValueModel.h"
 
@@ -198,6 +200,7 @@
         // whatever the user chose last time around
         PluginXml(plugin).setParametersFromXml(configurationXml);
 
+#ifndef NO_SV_GUI
         int sourceChannels = 1;
         if (dynamic_cast<DenseTimeValueModel *>(inputModel)) {
             sourceChannels = dynamic_cast<DenseTimeValueModel *>(inputModel)
@@ -286,12 +289,16 @@
         transform.setBlockSize(blockSize);
         transform.setWindowType(windowType);
 
+#endif
+
         TransformFactory::getInstance()->
             makeContextConsistentWithPlugin(transform, plugin);
 
         configurationXml = PluginXml(plugin).toXmlString();
 
+#ifndef NO_SV_GUI
         delete dialog;
+#endif
 
         if (effect && source) {
             source->setAuditioningEffect(0); // will delete our plugin
@@ -307,30 +314,7 @@
 
     return input;
 }
-/*!!!
-PluginTransformer::ExecutionContext
-ModelTransformerFactory::getDefaultContextForTransformer(TransformId identifier,
-                                                Model *inputModel)
-{
-    PluginTransformer::ExecutionContext context(-1);
 
-    QString id = identifier.section(':', 0, 2);
-
-    if (FeatureExtractionPluginFactory::instanceFor(id)) {
-
-        Vamp::Plugin *vp =
-            FeatureExtractionPluginFactory::instanceFor(id)->instantiatePlugin
-            (id, inputModel ? inputModel->getSampleRate() : 48000);
-
-        if (vp) {
-            context = PluginTransformer::ExecutionContext(-1, vp);
-            delete vp;
-        }
-    }
-
-    return context;
-}
-*/
 ModelTransformer *
 ModelTransformerFactory::createTransformer(const Transform &transform,
                                            const ModelTransformer::Input &input)