comparison src/FeatureExtractor.cpp @ 188:487261a22b18 re-minimise

distance_t * diagonalWeight might not fit in distance_t; use pathcost_t for it. Also remove C-style casts.

     // 440Hz -- and then use it to scale the individual
     // frequency-domain audio frames before applying the map to them.
     
     double refFreq = 440.; // See above -- *not* the parameter!
     double binWidth = double(m_params.sampleRate) / m_params.fftSize;
-    int crossoverBin = (int)(2 / (pow(2, 1/12.0) - 1));
+    int crossoverBin = int(2 / (pow(2, 1/12.0) - 1));
     int crossoverMidi = int(log(crossoverBin * binWidth / refFreq)/
                             log(2.0) * 12 + 69 + 0.5);
 
     int i = 0;
     while (i <= crossoverBin) {

 void
 FeatureExtractor::makeChromaFrequencyMap()
 {
     double refFreq = m_params.referenceFrequency;
     double binWidth = double(m_params.sampleRate) / m_params.fftSize;
-    int crossoverBin = (int)(1 / (pow(2, 1/12.0) - 1));
+    int crossoverBin = int(1 / (pow(2, 1/12.0) - 1));
     int i = 0;
     while (i <= crossoverBin) {
         double freq = i * binWidth;
         if (freq < m_params.minFrequency || freq > m_params.maxFrequency) {
             m_freqMap[i++] = -1;