# HG changeset patch
# User Matthias Mauch <mail@matthiasmauch.net>
# Date 1289794796 -32400
# Node ID 3277f6cef3feb15e29c4722a12025ff99e59089b
# Parent  e8ceb7d3bd4f328f4f49f69d00d548a31c8d47e8
added consonance output

diff -r e8ceb7d3bd4f -r 3277f6cef3fe NNLSChroma.cpp
--- a/NNLSChroma.cpp	Mon Nov 15 11:01:56 2010 +0900
+++ b/NNLSChroma.cpp	Mon Nov 15 13:19:56 2010 +0900
@@ -171,6 +171,21 @@
     list.push_back(d6);
     m_outputBothChroma = index++;
   
+    OutputDescriptor d7;
+    d7.identifier = "consonance";
+    d7.name = "Consonance estimate.";
+    d7.description = "A simple consonance value based on the convolution of a consonance profile with the semitone spectrum.";
+    d7.unit = "";
+    d7.hasFixedBinCount = true;
+    d7.binCount = 1;
+    d7.hasKnownExtents = false;
+    d7.isQuantized = false;
+    d7.sampleType = OutputDescriptor::FixedSampleRate;
+    d7.hasDuration = false;
+    d7.sampleRate = (m_stepSize == 0) ? m_inputSampleRate/2048 : m_inputSampleRate/m_stepSize;
+    list.push_back(d7);
+    m_outputConsonance = index++;
+  
     return list;
 }
 
diff -r e8ceb7d3bd4f -r 3277f6cef3fe NNLSChroma.h
--- a/NNLSChroma.h	Mon Nov 15 11:01:56 2010 +0900
+++ b/NNLSChroma.h	Mon Nov 15 13:19:56 2010 +0900
@@ -50,6 +50,7 @@
     mutable int m_outputChroma;
     mutable int m_outputBassChroma;
     mutable int m_outputBothChroma;
+    mutable int m_outputConsonance;
 };