Mercurial > hg > nnls-chroma
diff Chordino.cpp @ 115:526250b06fe0 monophonicness
some comments, some variable renamings
author | Matthias Mauch <mail@matthiasmauch.net> |
---|---|
date | Thu, 31 Mar 2011 14:26:53 +0100 |
parents | 3f104bceac99 |
children | 4663b1f184e8 |
line wrap: on
line diff
--- a/Chordino.cpp Thu Mar 31 13:51:45 2011 +0100 +++ b/Chordino.cpp Thu Mar 31 14:26:53 2011 +0100 @@ -36,8 +36,6 @@ m_chordnames(0) { if (debug_on) cerr << "--> Chordino" << endl; - // get the *chord* dictionary from file (if the file exists) - } Chordino::~Chordino() @@ -259,7 +257,7 @@ if (!NNLSBase::initialise(channels, stepSize, blockSize)) { return false; } - m_chordnames = chordDictionary(&m_chorddict, &m_chordnotes, m_boostN, m_useHarte); + m_chordnames = chordDictionary(&m_chorddict, &m_chordnotes, m_boostN, m_harte_syntax); return true; } @@ -315,10 +313,6 @@ **/ cerr << endl << "[Chordino Plugin] Tuning Log-Frequency Spectrogram ... "; - float tempValue = 0; - float dbThreshold = 0; // relative to the background spectrum - float thresh = pow(10,dbThreshold/20); - // cerr << "tune local ? " << m_tuneLocal << endl; int count = 0; FeatureList tunedSpec; @@ -342,7 +336,7 @@ // cerr << intShift << " " << floatShift << endl; for (int k = 2; k < (int)currentLogSpectrum.values.size() - 3; ++k) { // interpolate all inner bins - tempValue = currentLogSpectrum.values[k + intShift] * (1-floatShift) + currentLogSpectrum.values[k+intShift+1] * floatShift; + float tempValue = currentLogSpectrum.values[k + intShift] * (1-floatShift) + currentLogSpectrum.values[k+intShift+1] * floatShift; currentTunedSpec.values.push_back(tempValue); }