Mercurial > hg > svcore

changeset 344:277006c62fea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Fix idiotic bug in previous commit
author Chris Cannam
date Wed, 28 Nov 2007 13:20:40 +0000
parents 46519c04321b
children 700cd3350391
files plugin/transform/FeatureExtractionModelTransformer.cpp plugin/transform/FeatureExtractionModelTransformer.h plugin/transform/PluginTransformer.cpp
diffstat 3 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/plugin/transform/FeatureExtractionModelTransformer.cpp	Wed Nov 28 13:01:50 2007 +0000
+++ b/plugin/transform/FeatureExtractionModelTransformer.cpp	Wed Nov 28 13:20:40 2007 +0000
@@ -35,7 +35,7 @@
 
 FeatureExtractionModelTransformer::FeatureExtractionModelTransformer(Model *inputModel,
 								   QString pluginId,
-                                                                   ExecutionContext context,
+                                                                   const ExecutionContext &context,
                                                                    QString configurationXml,
 								   QString outputName) :
     PluginTransformer(inputModel, context),
@@ -62,7 +62,7 @@
 	return;
     }
 
-    context.makeConsistentWithPlugin(m_plugin);
+    m_context.makeConsistentWithPlugin(m_plugin);
 
     if (configurationXml != "") {
         PluginXml(m_plugin).setParametersFromXml(configurationXml);
--- a/plugin/transform/FeatureExtractionModelTransformer.h	Wed Nov 28 13:01:50 2007 +0000
+++ b/plugin/transform/FeatureExtractionModelTransformer.h	Wed Nov 28 13:20:40 2007 +0000
@@ -26,10 +26,10 @@
 
 public:
     FeatureExtractionModelTransformer(Model *inputModel,
-                                       QString plugin,
-                                       ExecutionContext context,
-                                       QString configurationXml = "",
-                                       QString outputName = "");
+                                      QString plugin,
+                                      const ExecutionContext &context,
+                                      QString configurationXml = "",
+                                      QString outputName = "");
     virtual ~FeatureExtractionModelTransformer();
 
 protected:
--- a/plugin/transform/PluginTransformer.cpp	Wed Nov 28 13:01:50 2007 +0000
+++ b/plugin/transform/PluginTransformer.cpp	Wed Nov 28 13:20:40 2007 +0000
@@ -95,8 +95,11 @@
 //        std::cerr << "makeConsistentWithPlugin: not a Vamp::HostExt::PluginWrapper" << std::endl;
     }
 
+//    std::cerr << "makeConsistentWithPlugin: stepSize = " << stepSize << ", blockSize = " << blockSize << std::endl;
+
     if (!vp) {
         domain = Vamp::Plugin::TimeDomain;
+//        std::cerr << "time domain RT plugin" << std::endl;
         if (!stepSize) {
             if (!blockSize) blockSize = 1024;
             stepSize = blockSize;
@@ -105,6 +108,7 @@
         }
     } else {
         domain = vp->getInputDomain();
+//        std::cerr << "feature extraction plugin" << std::endl;
         if (!stepSize) stepSize = vp->getPreferredStepSize();
         if (!blockSize) blockSize = vp->getPreferredBlockSize();
         if (!blockSize) blockSize = 1024;