comparison plugins/SegmenterPlugin.cpp @ 178:f96ea0e4b475

Fix compiler warnings with -Wall -Wextra

 using std::ostringstream;
 
 SegmenterPlugin::SegmenterPlugin(float inputSampleRate) :
     Plugin(inputSampleRate),
     segmenter(0),
+    hopsize(0),
+    windowsize(0),
+    neighbourhoodLimit(4),
     nSegmentTypes(10),
-    neighbourhoodLimit(4),
     featureType(feature_types(1))
 {
 	
 }
 

     if (channels < getMinChannelCount() ||
 	channels > getMaxChannelCount()) return false;
 
     if (!segmenter) makeSegmenter();
 
-    if (stepSize != hopsize) {
+    if (int(stepSize) != hopsize) {
         std::cerr << "SegmenterPlugin::initialise: supplied step size "
                   << stepSize << " differs from required step size " << hopsize
                   << std::endl;
         return false;
     }
 
-    if (blockSize != windowsize) {
+    if (int(blockSize) != windowsize) {
         std::cerr << "SegmenterPlugin::initialise: supplied block size "
                   << blockSize << " differs from required block size " << windowsize
                   << std::endl;
         return false;
     }        

 SegmenterPlugin::FeatureSet
 SegmenterPlugin::process(const float *const *inputBuffers, Vamp::RealTime timestamp)
 {
     // convert float* to double*
     double *tempBuffer = new double[windowsize];
-    for (size_t i = 0; i < windowsize; ++i) {
+    for (int i = 0; i < windowsize; ++i) {
         tempBuffer[i] = inputBuffers[0][i];
     }
 
     segmenter->extractFeatures(tempBuffer, segmenter->getWindowsize());
 

     // Map the segment types onto a dense series starting at 1
 	
     std::map<int, int> typeMap;
     int nextType = 1;
 
-    for (int i = 0; i < segm.segments.size(); ++i) {
+    for (int i = 0; i < int(segm.segments.size()); ++i) {
         Segment s = segm.segments[i];
         if (typeMap.find(s.type) == typeMap.end()) {
             typeMap[s.type] = nextType;
             ++nextType;
         }
     }
 
-    for (int i = 0; i < segm.segments.size(); ++i) {
+    for (int i = 0; i < int(segm.segments.size()); ++i) {
 		
         Segment s = segm.segments[i];
 		
         Feature feature;
         feature.hasTimestamp = true;
         feature.timestamp = Vamp::RealTime::frame2RealTime
             (s.start, (int)m_inputSampleRate);
         feature.hasDuration = true;
 
-        if (i + 1 < segm.segments.size()) {
+        if (i + 1 < int(segm.segments.size())) {
             feature.duration = Vamp::RealTime::frame2RealTime
                 (segm.segments[i+1].start - s.start, (int)m_inputSampleRate);
         } else {
             feature.duration = m_endTime - feature.timestamp;
         }