diff runner/main.cpp @ 171:c1834a31029c

Merge from branch "jams"

--- a/runner/main.cpp	Wed Oct 15 13:06:27 2014 +0100
+++ b/runner/main.cpp	Wed Oct 15 16:09:47 2014 +0100
@@ -939,17 +939,25 @@
         }
         if (multiplex) {
             try {
+                for (int i = 0; i < (int)writers.size(); ++i) {
+                    writers[i]->setNofM(1, 1);
+                }
                 manager.extractFeaturesMultiplexed(goodSources);
             } catch (const std::exception &e) {
                 cerr << "ERROR: Feature extraction failed: "
                      << e.what() << endl;
             }
         } else {
+            int n = 0;
             for (QStringList::const_iterator i = goodSources.begin();
                  i != goodSources.end(); ++i) {
                 std::cerr << "Extracting features for: \"" << i->toStdString()
                           << "\"" << std::endl;
+                ++n;
                 try {
+                    for (int j = 0; j < (int)writers.size(); ++j) {
+                        writers[j]->setNofM(n, goodSources.size());
+                    }
                     manager.extractFeatures(*i);
                 } catch (const std::exception &e) {
                     cerr << "ERROR: Feature extraction failed for \""