# HG changeset patch
# User Chris Cannam
# Date 1288258588 -7200
# Node ID 3ef99d22ec6b1306e081b34b826b702fd66d80e8
# Parent  45fc8c48af3b737f4eb79c966de1a93b00ca9777# Parent  b8ffc98eda954e636f081da5c8452e17cbcd5881
Merge

diff -r 45fc8c48af3b -r 3ef99d22ec6b Tuning.cpp
--- a/Tuning.cpp	Thu Oct 28 09:15:35 2010 +0200
+++ b/Tuning.cpp	Thu Oct 28 11:36:28 2010 +0200
@@ -106,13 +106,13 @@
     d0.description = "Returns a single label (at time 0 seconds) containing an estimate of the concert pitch in Hz.";
     d0.unit = "Hz";
     d0.hasFixedBinCount = true;
-    d0.binCount = 0;
+    d0.binCount = 1;
     d0.hasKnownExtents = true;
     d0.minValue = 427.47;
     d0.maxValue = 452.89;
     d0.isQuantized = false;
     d0.sampleType = OutputDescriptor::VariableSampleRate;
-    d0.hasDuration = false;
+    d0.hasDuration = true;
     list.push_back(d0);
     m_outputTuning = index++;
 	
@@ -203,6 +203,8 @@
     f0.timestamp = Vamp::RealTime::frame2RealTime(0, lrintf(m_inputSampleRate));
     f0.values.push_back(cumulativetuning);
     f0.label = buffer0;
+    f0.hasDuration = true;
+    f0.duration = m_logSpectrum[m_logSpectrum.size()-1].timestamp;
     fsOut[m_outputTuning].push_back(f0);  
 		    
     return fsOut;     
diff -r 45fc8c48af3b -r 3ef99d22ec6b nnls-chroma.n3
--- a/nnls-chroma.n3	Thu Oct 28 09:15:35 2010 +0200
+++ b/nnls-chroma.n3	Thu Oct 28 11:36:28 2010 +0200
@@ -321,10 +321,10 @@
     a                 vamp:KnownExtentsOutput ;
     vamp:min_value    427.47  ;
     vamp:max_value    452.89  ;
-    vamp:bin_count        0 ;
+    vamp:bin_count        1 ;
     vamp:sample_type      vamp:VariableSampleRate ;
     vamp:sample_rate      2.38221e-44 ;
-    vamp:computes_event_type   af:MusicSegment;
+    vamp:computes_event_type   af:Segment;
     .
 plugbase:tuning_output_localtuning a  vamp:DenseOutput ;
     vamp:identifier       "localtuning" ;