Mercurial > hg > svgui
diff layer/SpectrogramLayer.cpp @ 860:4a5d144bd5d0 tonioni
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Tue, 09 Sep 2014 16:36:21 +0100 (2014-09-09) |
| parents | d7f6f60a8b30 |
| children | 1986c9b0d9c3 0fe1f4407261 |
line wrap: on
line diff
--- a/layer/SpectrogramLayer.cpp Tue Sep 02 16:23:48 2014 +0100 +++ b/layer/SpectrogramLayer.cpp Tue Sep 09 16:36:21 2014 +0100 @@ -1445,7 +1445,7 @@ if (!fft->isColumnAvailable(s)) continue; - float binfreq = (sr * q) / m_windowSize; + float binfreq = (float(sr) * q) / m_windowSize; if (q == q0i) freqMin = binfreq; if (q == q1i) freqMax = binfreq; @@ -2479,7 +2479,7 @@ FFTModel::PeakSet peakfreqs; - int px = -1, psx = -1; + int psx = -1; #ifdef __GNUC__ float values[maxbin - minbin + 1]; @@ -2500,7 +2500,6 @@ for (int sx = sx0; sx < sx1; ++sx) { - if (x == px && sx == psx) continue; if (sx < 0 || sx >= int(fft->getWidth())) continue; if (!m_synchronous) { @@ -2931,7 +2930,7 @@ // SVDEBUG << "SpectrogramLayer::setDisplayExtents: " << min << "->" << max << endl; if (min < 0) min = 0; - if (max > m_model->getSampleRate()/2) max = m_model->getSampleRate()/2; + if (max > m_model->getSampleRate()/2.f) max = m_model->getSampleRate()/2.f; int minf = lrintf(min); int maxf = lrintf(max);