diff runner/FeatureExtractionManager.cpp @ 95:03b1d83fca29

Update subrepos, fix compile for updated versions, track version.h

--- a/runner/FeatureExtractionManager.cpp	Sat Apr 26 22:22:17 2014 +0100
+++ b/runner/FeatureExtractionManager.cpp	Wed Oct 01 08:49:01 2014 +0100
@@ -459,7 +459,8 @@
         // (then close, and open again later with actual desired rate &c)
 
         AudioFileReader *reader =
-            AudioFileReaderFactory::createReader(source, 0, &retrievalProgress);
+            AudioFileReaderFactory::createReader(source, 0, false,
+                                                 &retrievalProgress);
     
         if (!reader) {
             throw FailedToOpenFile(audioSource);
@@ -504,7 +505,7 @@
                          << files[i].toStdString()
                          << "\": " << e.what() << endl;
                     // print a note only if we have more files to process
-                    if (++i != files.size()) {
+                    if (++i != (int)files.size()) {
                         cerr << "NOTE: \"--force\" option was provided, continuing (more errors may occur)" << endl;
                     }
                 }
@@ -545,7 +546,7 @@
         FileSource source(audioSource, &retrievalProgress);
         source.waitForData();
         reader = AudioFileReaderFactory::createReader
-            (source, m_sampleRate, &retrievalProgress);
+            (source, m_sampleRate, false, &retrievalProgress);
         retrievalProgress.done();
     }