changeset 244:8042ab66f707

* tidy
author cannam
date Mon, 10 Nov 2008 22:10:20 +0000
parents 3cf5bd155e5b
children 7ed04d09bc8b
files README examples/FixedTempoEstimator.cpp
diffstat 2 files changed, 5 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/README	Mon Nov 10 22:04:40 2008 +0000
+++ b/README	Mon Nov 10 22:10:20 2008 +0000
@@ -130,11 +130,11 @@
  domain representation of each block of audio.
 
  - PowerSpectrum calculates a power spectrum from the input audio.
- Actually, it doesn't do any work except converting from the cartesian
- complex representation.  The work of converting to frequency domain
- is all done for it by the host or host SDK; the plugin just needs to
- declare that it wants frequency domain input.  This is the simplest
- of the example plugins.
+ Actually, it doesn't do any work except calculating power from a
+ cartesian complex FFT output.  The work of calculating this frequency
+ domain output is done for it by the host or host SDK; the plugin just
+ needs to declare that it wants frequency domain input.  This is the
+ simplest of the example plugins.
 
  - AmplitudeFollower is a simple implementation of SuperCollider's
  amplitude-follower algorithm.
--- a/examples/FixedTempoEstimator.cpp	Mon Nov 10 22:04:40 2008 +0000
+++ b/examples/FixedTempoEstimator.cpp	Mon Nov 10 22:10:20 2008 +0000
@@ -367,8 +367,6 @@
 void
 FixedTempoEstimator::D::calculate()
 {    
-    cerr << "FixedTempoEstimator::calculate: m_n = " << m_n << endl;
-    
     if (m_r) {
         cerr << "FixedTempoEstimator::calculate: calculation already happened?" << endl;
         return;
@@ -447,11 +445,6 @@
         
         m_t[i] /= div;
         
-//        if (div > 1) {
-//            cerr << "adjusting tempo from " << lag2tempo(i) << " to "
-//                 << m_t[i] << " for fr = " << m_fr[i] << " (div = " << div << ")" << endl;
-//        }
-        
         m_fr[i] += m_fr[i] * (weight / 3);
     }
 }
@@ -499,8 +492,6 @@
 
     std::map<float, int> candidates;
 
-    std::cerr << "minbpm = " << m_minbpm << ", p0 = " << p0 << ", p1 = " << p1 << std::endl;
-
     for (int i = p0; i <= p1 && i < n/2-1; ++i) {
 
         if (m_fr[i] > m_fr[i-1] &&
@@ -517,8 +508,6 @@
         fs[FilteredACFOutput].push_back(feature);
     }
 
-//    cerr << "maxpi = " << maxpi << " for tempo " << lag2tempo(maxpi) << " (value = " << maxp << ")" << endl;
-
     if (candidates.empty()) {
         cerr << "No tempo candidates!" << endl;
         return fs;
@@ -552,7 +541,6 @@
     feature.label = "";
 
     while (feature.values.size() < 8) {
-//        cerr << "adding tempo value from lag " << ci->second << endl;
         if (m_t[ci->second] > 0) {
             feature.values.push_back(m_t[ci->second]);
         } else {