comparison src/ConstantQ.cpp @ 164:1081c73fbbe3

Various changes to make the code compatible with MSVC++ (though we don't provide projects for it yet)

 #include "dsp/FFT.h"
 
 #include <algorithm>
 #include <iostream>
 #include <stdexcept>
+
+#include <cmath>
 
 using std::vector;
 using std::cerr;
 using std::endl;
 

 }
 
 void
 ConstantQ::initialise()
 {
-    m_octaves = int(ceil(log2(m_maxFrequency / m_minFrequency)));
+    m_octaves = int(ceil(log(m_maxFrequency / m_minFrequency) / log(2)));
 
     if (m_octaves < 1) {
         m_kernel = 0; // incidentally causing isValid() to return false
         return;
     }

     // octave latencies below. In theory this is hard, in practice if
     // we ensure it for the last octave we should be OK.
     double finalOctLat = latencies[m_octaves-1];
     double finalOctFact = pow(2, m_octaves-1);
     totalLatency =
-        int(round(finalOctLat +
-                  finalOctFact *
-                  ceil((totalLatency - finalOctLat) / finalOctFact)));
+        int(finalOctLat +
+            finalOctFact *
+            ceil((totalLatency - finalOctLat) / finalOctFact) + .5);
 
 #ifdef DEBUG_CQ
     cerr << "total latency = " << totalLatency << endl;
 #endif
 

              << m_bigBlockSize << ") / " << factor << " = " 
              << octaveLatency << endl;
 #endif
 
         m_buffers.push_back
-            (RealSequence(int(round(octaveLatency)), 0.0));
+            (RealSequence(int(octaveLatency + 0.5), 0.0));
     }
 
     m_fft = new FFTReal(m_p.fftSize);
 }