diff options
author | Daniel Schürmann <daschuer@mixxx.org> | 2019-05-12 23:08:35 +0200 |
---|---|---|
committer | Daniel Schürmann <daschuer@mixxx.org> | 2019-05-12 23:08:35 +0200 |
commit | 2c81fb90d40c6947e157cad66c2059c46b464995 (patch) | |
tree | f742ec158488d8d14b5985377282b62d2613d6ce /lib | |
parent | d128878c355fe2a1fbb6f55ffbacfebcac354fa9 (diff) |
Remove compiler warnings
Diffstat (limited to 'lib')
-rw-r--r-- | lib/qm-dsp/dsp/chromagram/Chromagram.cpp | 14 | ||||
-rw-r--r-- | lib/qm-dsp/dsp/keydetection/GetKeyMode.cpp | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/lib/qm-dsp/dsp/chromagram/Chromagram.cpp b/lib/qm-dsp/dsp/chromagram/Chromagram.cpp index a8597a5ddd..2d6d8d194f 100644 --- a/lib/qm-dsp/dsp/chromagram/Chromagram.cpp +++ b/lib/qm-dsp/dsp/chromagram/Chromagram.cpp @@ -134,7 +134,7 @@ double* Chromagram::process( const double *data ) m_windowbuf = new double[m_frameSize]; } - for (int i = 0; i < m_frameSize; ++i) { + for (unsigned int i = 0; i < m_frameSize; ++i) { m_windowbuf[i] = data[i]; } m_window->cut(m_windowbuf); @@ -155,8 +155,6 @@ double* Chromagram::process( const double *real, const double *imag ) // initialise chromadata to 0 for (unsigned i = 0; i < m_BPO; i++) m_chromadata[i] = 0; - double cmax = 0.0; - double cval = 0; // Calculate ConstantQ frame m_ConstantQ->process( real, imag, m_CQRe, m_CQIm ); @@ -164,11 +162,11 @@ double* Chromagram::process( const double *real, const double *imag ) const unsigned octaves = (int)floor(double( m_uK/m_BPO))-1; for (unsigned octave = 0; octave <= octaves; octave++) { - unsigned firstBin = octave*m_BPO; - for (unsigned i = 0; i < m_BPO; i++) - { - m_chromadata[i] += kabs( m_CQRe[ firstBin + i ], m_CQIm[ firstBin + i ]); - } + unsigned firstBin = octave * m_BPO; + for (unsigned i = 0; i < m_BPO; i++) + { + m_chromadata[i] += kabs( m_CQRe[ firstBin + i ], m_CQIm[ firstBin + i ]); + } } MathUtilities::normalise(m_chromadata, m_BPO, m_normalise); diff --git a/lib/qm-dsp/dsp/keydetection/GetKeyMode.cpp b/lib/qm-dsp/dsp/keydetection/GetKeyMode.cpp index 9aa527f0ab..3fb0470ccb 100644 --- a/lib/qm-dsp/dsp/keydetection/GetKeyMode.cpp +++ b/lib/qm-dsp/dsp/keydetection/GetKeyMode.cpp @@ -185,7 +185,7 @@ int GetKeyMode::process(double *PCMData) MathUtilities::circShift( m_ChrPointer, m_BPO, 2);
/*
std::cout << "raw chroma: ";
- for (int ii = 0; ii < m_BPO; ++ii) {
+ for (unsigned int ii = 0; ii < m_BPO; ++ii) {
if (ii % (m_BPO/12) == 0) std::cout << "\n";
std::cout << m_ChrPointer[ii] << " ";
}
|