Mercurial > hg > qm-vamp-plugins

changeset 88:d47b22cf47bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* df config no longer contains stepSecs (it was unused)
author Chris Cannam <c.cannam@qmul.ac.uk>
date Tue, 10 Feb 2009 12:53:14 +0000
parents 790e051896a9
children f4a2f5aa743c
files plugins/BeatTrack.cpp plugins/OnsetDetect.cpp
diffstat 2 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/BeatTrack.cpp	Mon Feb 09 16:06:06 2009 +0000
+++ b/plugins/BeatTrack.cpp	Tue Feb 10 12:53:14 2009 +0000
@@ -211,7 +211,6 @@
 
     DFConfig dfConfig;
     dfConfig.DFType = m_dfType;
-    dfConfig.stepSecs = float(stepSize) / m_inputSampleRate;
     dfConfig.stepSize = stepSize;
     dfConfig.frameLength = blockSize;
     dfConfig.dbRise = 3;
@@ -445,7 +444,7 @@
     }
     if (df.empty()) return FeatureSet();
 
-    TempoTrackV2 tt;
+    TempoTrackV2 tt(m_inputSampleRate, m_d->dfConfig.stepSize);
 
     tt.calculateBeatPeriod(df, beatPeriod, tempi);
 
--- a/plugins/OnsetDetect.cpp	Mon Feb 09 16:06:06 2009 +0000
+++ b/plugins/OnsetDetect.cpp	Tue Feb 10 12:53:14 2009 +0000
@@ -251,7 +251,6 @@
 
     DFConfig dfConfig;
     dfConfig.DFType = m_dfType;
-    dfConfig.stepSecs = float(stepSize) / m_inputSampleRate;
     dfConfig.stepSize = stepSize;
     dfConfig.frameLength = blockSize;
     dfConfig.dbRise = 6.0 - m_sensitivity / 16.6667;
@@ -289,7 +288,7 @@
     OutputList list;
 
     float stepSecs = m_preferredStepSecs;
-    if (m_d) stepSecs = m_d->dfConfig.stepSecs;
+//    if (m_d) stepSecs = m_d->dfConfig.stepSecs;
 
     OutputDescriptor onsets;
     onsets.identifier = "onsets";