# HG changeset patch
# User cannam
# Date 1227635472 0
# Node ID 91821a3ab0b62158ea4a07d11623d5d6a98a790d
# Parent  6579e441f2febe7dd63eef41a50b89fa05787ad1
* Fix incorrect handling of step & block size in time-domain plugin that
  specifies neither
* Add computed_by for features to link back to their transforms

diff -r 6579e441f2fe -r 91821a3ab0b6 rdf/vamp.n3
--- a/rdf/vamp.n3	Tue Nov 25 13:16:07 2008 +0000
+++ b/rdf/vamp.n3	Tue Nov 25 17:51:12 2008 +0000
@@ -440,7 +440,7 @@
 	vs:term_status "unstable";
 	.
 
-# The next 3 properties are included to link in the Audio Features Ontology (not estrictly from the Vamp API).
+# The next 3 properties are included to link in the Audio Features Ontology (not strictly from the Vamp API).
 
 vamp:computes_event_type
 	a rdf:Property;
@@ -726,4 +726,21 @@
 #parameter declared above
 
 
+# The next property is here to link the Audio Features ontology to the
+# Transform ontology terms -- an audio feature may use this to
+# indicate which transform produced it
 
+vamp:computed_by
+	a rdf:Property;
+	a owl:ObjectProperty;
+	rdfs:label "computed by";
+	rdfs:comment """
+			Associates an audio feature with the transform that was used to compute it.
+	""";
+	rdfs:domain event:Event;
+	rdfs:domain af:Signal;
+	rdfs:range vamp:Transform;
+	vs:term_status "unstable";
+	.
+
+
diff -r 6579e441f2fe -r 91821a3ab0b6 src/vamp-hostsdk/PluginBufferingAdapter.cpp
--- a/src/vamp-hostsdk/PluginBufferingAdapter.cpp	Tue Nov 25 13:16:07 2008 +0000
+++ b/src/vamp-hostsdk/PluginBufferingAdapter.cpp	Tue Nov 25 17:51:12 2008 +0000
@@ -438,6 +438,11 @@
     if (m_blockSize == 0) {
         if (m_stepSize == 0) {
             m_blockSize = 1024;
+            if (freq) {
+                m_stepSize = m_blockSize / 2;
+            } else {
+                m_stepSize = m_blockSize;
+            }
         } else if (freq) {
             m_blockSize = m_stepSize * 2;
         } else {
@@ -475,7 +480,7 @@
     
     bool success = m_plugin->initialise(m_channels, m_stepSize, m_blockSize);
 
-    std::cerr << "PluginBufferingAdapter::initialise: success = " << success << std::endl;
+//    std::cerr << "PluginBufferingAdapter::initialise: success = " << success << std::endl;
 
     if (success) {
         // Re-query outputs; properties such as bin count may have
@@ -491,7 +496,7 @@
 PluginBufferingAdapter::Impl::getOutputDescriptors() const
 {
     if (m_outputs.empty()) {
-    std::cerr << "PluginBufferingAdapter::getOutputDescriptors: querying anew" << std::endl;
+//    std::cerr << "PluginBufferingAdapter::getOutputDescriptors: querying anew" << std::endl;
 
         m_outputs = m_plugin->getOutputDescriptors();
     }