comparison dsp/tempotracking/TempoTrack.cpp @ 231:dbc354a00714

* Make tempo tracker return locked tempo as well as beats

 
 #include "TempoTrack.h"
 
 #include "dsp/maths/MathAliases.h"
 #include "dsp/maths/MathUtilities.h"
+
+#include <iostream>
 
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////

 	{
 	    maxValRCF = m_tempoScratch[ i ];
 	    maxIndexRCF = i;
 	}
     }
-	
+
+    double locked = 5168.f / maxIndexRCF;
+    if (locked >= 30 && locked <= 180) {
+        m_lockedTempo = locked;
+    }
+
     if( tsig == 0 )
 	tsig = 4;
 
 	
     if( tsig == 4 )

 
 
 
 
 
-vector<int> TempoTrack::process( vector <double> DF )
+vector<int> TempoTrack::process( vector <double> DF,
+                                 vector <double> *tempoReturn )
 {
     m_dataLength = DF.size();
 	
+    m_lockedTempo = 0.0;
+
     double	period = 0.0;
     int stepFlag = 0;
     int constFlag = 0;
     int FSP = 0;
     int tsig = 0;

 
 	lastBeat = beatPredict(FSP, alignment[ TTLoopIndex ], period, m_lagLength );
 
 	FSP += (m_lagLength);
 
+        if (tempoReturn) tempoReturn->push_back(m_lockedTempo);
+
 	TTLoopIndex++;
     }
 
 
     delete [] periodP;