comparison layer/SpectrogramLayer.cpp @ 860:4a5d144bd5d0 tonioni

Merge from default branch

 
 	for (int s = s0i; s <= s1i; ++s) {
 
             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;
 
 	    if (peaksOnly && !fft->isLocalPeak(s, q)) continue;
 

     FFTModel *fft = getFFTModel(v);
     if (!fft) return false;
 
     FFTModel::PeakSet peakfreqs;
 
-    int px = -1, psx = -1;
+    int psx = -1;
 
 #ifdef __GNUC__
     float values[maxbin - minbin + 1];
 #else
     float *values = (float *)alloca((maxbin - minbin + 1) * sizeof(float));

         if (sx0 < 0) continue;
         if (sx1 <= sx0) sx1 = sx0 + 1;
 
         for (int sx = sx0; sx < sx1; ++sx) {
 
-            if (x == px && sx == psx) continue;
             if (sx < 0 || sx >= int(fft->getWidth())) continue;
 
             if (!m_synchronous) {
                 if (!fft->isColumnAvailable(sx)) {
 #ifdef DEBUG_SPECTROGRAM_REPAINT

     if (!m_model) return false;
 
 //    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);
 
     if (m_minFrequency == minf && m_maxFrequency == maxf) return true;