# HG changeset patch
# User Chris Cannam
# Date 1412149741 -3600
# Node ID 03b1d83fca292743290a6f4256947e95620deeb9
# Parent  41c4de1e05d86d011b7e124f0265247a6bd81f5a
Update subrepos, fix compile for updated versions, track version.h

diff -r 41c4de1e05d8 -r 03b1d83fca29 .hgignore
--- a/.hgignore	Sat Apr 26 22:22:17 2014 +0100
+++ b/.hgignore	Wed Oct 01 08:49:01 2014 +0100
@@ -14,3 +14,4 @@
 *~
 *.orig
 *.rej
+cov-int
diff -r 41c4de1e05d8 -r 03b1d83fca29 .hgsubstate
--- a/.hgsubstate	Sat Apr 26 22:22:17 2014 +0100
+++ b/.hgsubstate	Wed Oct 01 08:49:01 2014 +0100
@@ -1,2 +1,2 @@
-53939f99655e07866d8e9b5a0a10015335d8075f dataquay
-5821b64c6b26814ec0ae148747e6476ca42ec2c6 svcore
+d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
+e8e6c4e7437bf7d1a9a5bf937b53d20de99fdf89 svcore
diff -r 41c4de1e05d8 -r 03b1d83fca29 README
--- a/README	Sat Apr 26 22:22:17 2014 +0100
+++ b/README	Wed Oct 01 08:49:01 2014 +0100
@@ -25,7 +25,7 @@
 The main program is by Mark Levy, Chris Cannam, and Chris Sutton.
 Sonic Annotator incorporates library code from the Sonic Visualiser
 application by Chris Cannam.  Code copyright 2005-2007 Chris Cannam,
-copyright 2006-2013 Queen Mary, University of London, except where
+copyright 2006-2014 Queen Mary, University of London, except where
 indicated in the individual source files.
 
 This work was funded by the Engineering and Physical Sciences Research
diff -r 41c4de1e05d8 -r 03b1d83fca29 runner/FeatureExtractionManager.cpp
--- 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();
     }
 
diff -r 41c4de1e05d8 -r 03b1d83fca29 runner/main.cpp
--- a/runner/main.cpp	Sat Apr 26 22:22:17 2014 +0100
+++ b/runner/main.cpp	Wed Oct 01 08:49:01 2014 +0100
@@ -144,7 +144,7 @@
     cerr << "Sonic Annotator v" << RUNNER_VERSION << endl;
     cerr << "A utility for batch feature extraction from audio files." << endl;
     cerr << "Mark Levy, Chris Sutton and Chris Cannam, Queen Mary, University of London." << endl;
-    cerr << "Copyright 2007-2013 Queen Mary, University of London." << endl;
+    cerr << "Copyright 2007-2014 Queen Mary, University of London." << endl;
     cerr << endl;
     cerr << "This program is free software.  You may redistribute copies of it under the" << endl;
     cerr << "terms of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>." << endl;
@@ -611,13 +611,13 @@
         map<string, string> writerArgs;
         FeatureWriter::ParameterList pl(writer->getSupportedParameters());
 
-        for (int k = 0; k < pl.size(); ++k) {
+        for (int k = 0; k < (int)pl.size(); ++k) {
             
             string argbase = pl[k].name;
             QString literal = QString("--%1-%2")
                 .arg(i->c_str()).arg(argbase.c_str());
             
-            for (int j = 0; j < otherArgs.size(); ) {
+            for (int j = 0; j < (int)otherArgs.size(); ) {
                 
                 if (otherArgs[j] != literal) {
                     ++j;
@@ -669,7 +669,7 @@
         PlaylistFileReader reader(i->c_str());
         if (reader.isOK()) {
             vector<QString> files = reader.load();
-            for (int j = 0; j < files.size(); ++j) {
+            for (int j = 0; j < (int)files.size(); ++j) {
                 requestedTransformFiles.insert(files[j].toStdString());
             }
         } else {
@@ -771,7 +771,7 @@
         }
     }
     
-    for (int i = 0; i < writers.size(); ++i) delete writers[i];
+    for (int i = 0; i < (int)writers.size(); ++i) delete writers[i];
 
 #ifdef HAVE_FFTW3
     settings.beginGroup("FFTWisdom");
diff -r 41c4de1e05d8 -r 03b1d83fca29 version.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/version.h	Wed Oct 01 08:49:01 2014 +0100
@@ -0,0 +1,1 @@
+#define RUNNER_VERSION "1.0"