comparison ConstrainedHarmonicPeak.cpp @ 14:de970142809f tip

Fix some warnings

 
 #include "ConstrainedHarmonicPeak.h"
 
 #include <cmath>
 #include <cstdio>
+#include <climits>
 
 using std::cerr;
 using std::endl;
 using std::vector;
 

     if (identifier == "minfreq") {
 	return m_minFreq;
     } else if (identifier == "maxfreq") {
 	return m_maxFreq;
     } else if (identifier == "harmonics") {
-	return m_harmonics;
+	return float(m_harmonics);
     }
     return 0;
 }
 
 void

 {
     return ""; // no programs
 }
 
 void
-ConstrainedHarmonicPeak::selectProgram(string name)
+ConstrainedHarmonicPeak::selectProgram(string)
 {
 }
 
 ConstrainedHarmonicPeak::OutputList
 ConstrainedHarmonicPeak::getOutputDescriptors() const

 
     return list;
 }
 
 bool
-ConstrainedHarmonicPeak::initialise(size_t channels, size_t stepSize, size_t blockSize)
+ConstrainedHarmonicPeak::initialise(size_t channels, size_t, size_t blockSize)
 {
     if (channels < getMinChannelCount() ||
 	channels > getMaxChannelCount()) {
 	cerr << "ConstrainedHarmonicPeak::initialise: ERROR: channels " << channels
 	     << " out of acceptable range " << getMinChannelCount()
 	     << " -> " << getMaxChannelCount() << endl;
 	return false;
     }
 
-    m_fftSize = blockSize;
+    if (blockSize > INT_MAX) {
+        return false; // arf
+    }
+    
+    m_fftSize = int(blockSize);
 
     return true;
 }
 
 void

 
     return double(peakbin) + p;
 }
 
 ConstrainedHarmonicPeak::FeatureSet
-ConstrainedHarmonicPeak::process(const float *const *inputBuffers, Vamp::RealTime timestamp)
+ConstrainedHarmonicPeak::process(const float *const *inputBuffers, Vamp::RealTime)
 {
     FeatureSet fs;
 
     // This could be better. The procedure here is
     // 

 		       inputBuffers[0][i*2+1] * inputBuffers[0][i*2+1]);
     }
 
     // bin freq is bin * samplerate / fftsize
 
-    int minbin = int(floor((m_minFreq * m_fftSize) / m_inputSampleRate));
-    int maxbin = int(ceil((m_maxFreq * m_fftSize) / m_inputSampleRate));
+    int minbin = int(floor((double(m_minFreq) * m_fftSize) / m_inputSampleRate));
+    int maxbin = int(ceil((double(m_maxFreq) * m_fftSize) / m_inputSampleRate));
     if (minbin > hs) minbin = hs;
     if (maxbin > hs) maxbin = hs;
     if (maxbin <= minbin) return fs;
 
     double *hps = new double[maxbin - minbin + 1];

     if (freq < m_minFreq || freq > m_maxFreq) {
         return fs;
     }
 
     Feature f;
-    f.values.push_back(freq);
+    f.values.push_back(float(freq));
     fs[0].push_back(f);
 
     return fs;
 }