# HG changeset patch # User Chris Cannam # Date 1318864858 -3600 # Node ID c10853ea9b7139810d73eda4654aa23c2d872d5a # Parent 62811ec41cbf08962a893807ee697dea356e0a38# Parent b5daf8fc05ba4a8c2265560703b47f95f89447de Merge diff -r b5daf8fc05ba -r c10853ea9b71 rdf/RDFFeatureWriter.cpp --- a/rdf/RDFFeatureWriter.cpp Mon Oct 10 17:27:54 2011 +0100 +++ b/rdf/RDFFeatureWriter.cpp Mon Oct 17 16:20:58 2011 +0100 @@ -75,10 +75,11 @@ p.hasArg = true; pl.push_back(p); - p.name = "network"; - p.description = "Attempt to retrieve RDF descriptions of plugins from network, if not available locally"; - p.hasArg = false; - pl.push_back(p); + //mathieub: remove this functionality for the library edition + //p.name = "network"; + //p.description = "Attempt to retrieve RDF descriptions of plugins from network, if not available locally"; + //p.hasArg = false; + //pl.push_back(p); return pl; } @@ -102,9 +103,10 @@ if (i->first == "maker-uri") { m_userMakerUri = i->second.c_str(); } - if (i->first == "network") { - m_network = true; - } + //mathieub: remove this functionality for the library edition + //if (i->first == "network") { + // m_network = true; + //} } } diff -r b5daf8fc05ba -r c10853ea9b71 transform/FeatureExtractionModelTransformer.cpp --- a/transform/FeatureExtractionModelTransformer.cpp Mon Oct 10 17:27:54 2011 +0100 +++ b/transform/FeatureExtractionModelTransformer.cpp Mon Oct 17 16:20:58 2011 +0100 @@ -176,9 +176,8 @@ { DenseTimeValueModel *input = getConformingInput(); -// std::cerr << "FeatureExtractionModelTransformer: output sample type " -// << m_descriptor->sampleType << std::endl; - +// std::cerr << "FeatureExtractionModelTransformer::createOutputModel: sample type " << m_descriptor->sampleType << ", rate " << m_descriptor->sampleRate << std::endl; + PluginRDFDescription description(m_transform.getPluginIdentifier()); QString outputId = m_transform.getOutput(); @@ -201,7 +200,7 @@ size_t modelRate = input->getSampleRate(); size_t modelResolution = 1; - + switch (m_descriptor->sampleType) { case Vamp::Plugin::OutputDescriptor::VariableSampleRate: @@ -636,8 +635,11 @@ { size_t inputRate = m_input.getModel()->getSampleRate(); -// SVDEBUG << "FeatureExtractionModelTransformer::addFeature(" -// << blockFrame << ")" << endl; +// std::cerr << "FeatureExtractionModelTransformer::addFeature: blockFrame = " +// << blockFrame << ", hasTimestamp = " << feature.hasTimestamp +// << ", timestamp = " << feature.timestamp << ", hasDuration = " +// << feature.hasDuration << ", duration = " << feature.duration +// << std::endl; int binCount = 1; if (m_descriptor->hasFixedBinCount) {