comparison src/Silvet.cpp @ 356:7dcff010d9cd

Some tidying, switch to libc++

 #include "constant-q-cpp/src/dsp/Resampler.h"
 #include "flattendynamics-ladspa.h"
 #include "LiveInstruments.h"
 
 #include <vector>
+
+#include <cstdio>
+
+#if (defined(MAX_EM_THREADS) && (MAX_EM_THREADS > 1))
 #include <future>
-
-#include <cstdio>
+using std::future;
+using std::async;
+#endif
 
 using std::vector;
 using std::cout;
 using std::cerr;
 using std::endl;
 using std::pair;
-using std::future;
-using std::async;
+
 using Vamp::RealTime;
 
 static int processingSampleRate = 44100;
 
 static int binsPerSemitoneLive = 1;

     vector<vector<int> > localBestShifts;
     if (wantShifts) {
         localBestShifts = vector<vector<int> >(width);
     }
 
-    int emThreadCount = MAX_EM_THREADS;
+    int emThreadCount = 1;
+
+#if (defined(MAX_EM_THREADS) && (MAX_EM_THREADS > 1))
+    emThreadCount = MAX_EM_THREADS;
+
     if (emThreadCount > int(std::thread::hardware_concurrency())) {
         emThreadCount = std::thread::hardware_concurrency();
     }
     if (m_mode == LiveMode && pack.templates.size() == 1) {
         // The EM step is probably not slow enough to merit it
         emThreadCount = 1;
     }
 
-#if (defined(MAX_EM_THREADS) && (MAX_EM_THREADS > 1))
     if (emThreadCount > 1) {
         for (int i = 0; i < width; ) {
             typedef future<pair<vector<double>, vector<int>>> EMFuture;
             vector<EMFuture> results;
             for (int j = 0; j < emThreadCount && i + j < width; ++j) {