Mercurial > hg > vamp-tempogram
diff TempogramPlugin.h @ 22:99380ba63be6
* Changed input of NoveltyCurve::spectrogramToNoveltyCurve() from transposed spe
ctrogram to spectrogram
* Collect spectrogram from process(), not transposed spectrogram
* allowed OctaveDivider parameter to be any value in range, despite number of binumber of values in the range
author | Carl Bussey <c.bussey@se10.qmul.ac.uk> |
---|---|
date | Tue, 19 Aug 2014 16:52:19 +0100 |
parents | 12b952286959 |
children | fe23998968b4 |
line wrap: on
line diff
--- a/TempogramPlugin.h Mon Aug 18 15:22:44 2014 +0100 +++ b/TempogramPlugin.h Tue Aug 19 16:52:19 2014 +0100 @@ -77,7 +77,7 @@ // plugin-specific data and methods go here size_t m_inputBlockSize; size_t m_inputStepSize; - SpectrogramTransposed m_spectrogram; //spectrogram data + Spectrogram m_spectrogram; //spectrogram data //Novelty Curve specific parameters float m_noveltyCurveMinDB; @@ -102,8 +102,8 @@ int m_cyclicTempogramOctaveDivider; string floatToString(float value) const; - vector<unsigned int> calculateTempogramNearestNeighbourLogBins() const; - int bpmToBin(const float &bpm) const; + vector< vector<unsigned int> > calculateTempogramNearestNeighbourLogBins() const; + unsigned int bpmToBin(const float &bpm) const; float binToBPM (const int &bin) const; bool handleParameterValues(); };