Merge pull request #2 from jamesb93/progress-output

Progress output

include/FluidCLIWrapper.hpp

@@ -18,10 +18,12 @@ under the European Union’s Horizon 2020 research and innovation programme
 #include <clients/common/ParameterTypes.hpp>
 #include <FluidVersion.hpp>
 #include <cctype>
+#include <chrono>
 #include <iomanip>
 #include <iostream>
 #include <regex>
 #include <string>
+#include <thread>
 #include <utility>
 #include <vector>
 
@@ -388,20 +390,45 @@ class CLIWrapper
     params.constrainParameterValues();
 
     // Create client after all parameters are set
-    FluidContext context;
+        // Create client after all parameters are set
     ClientType   client(params);
-    auto         result = client.process(context);
+    Result result;
+
+    client.enqueue(params);
+    result = client.process();
+
+    double progress = 0.0; // Variable to store progress
+
+    while(result.ok())
+    {
+        ProcessState state = client.checkProgress(result);
+
+        if (state == ProcessState::kDone || state == ProcessState::kDoneStillProcessing) {
+          std::cout << '\n';
+          break;
+        }
+        if (state != ProcessState::kDone) {
+          double newProgress = client.progress();
+          if (newProgress - progress >=0.01)
+          {
+            std::cout << newProgress << '\r' << std::flush;
+
+            progress = newProgress;
+          }
+          using namespace std::chrono_literals;
+          std::this_thread::sleep_for(20ms); 
+          continue; 
+        }
+    }
 
     if (!result.ok())
     {
       // Output error
-
       std::cerr << result.message() << "\n";
     }
     else
     {
       // Write files
-
       bool allowCSV = true;
       params.template forEachParamType<BufferT, WriteFiles>(allowCSV);
     }
@@ -412,3 +439,5 @@ class CLIWrapper
 
 } // namespace client
 } // namespace fluid
+
+

src/fluid-ampgate/fluid-ampgate.cpp

@@ -15,5 +15,5 @@ under the European Union’s Horizon 2020 research and innovation programme
 int main(int argc, const char* argv[])
 {
   using namespace fluid::client;
-  return CLIWrapper<NRTAmpGateClient>::run(argc, argv);
+  return CLIWrapper<NRTThreadedAmpGateClient>::run(argc, argv);
 }

src/fluid-ampslice/fluid-ampslice.cpp

@@ -15,5 +15,5 @@ under the European Union’s Horizon 2020 research and innovation programme
 int main(int argc, const char* argv[])
 {
   using namespace fluid::client;
-  return CLIWrapper<NRTAmpSliceClient>::run(argc, argv);
+  return CLIWrapper<NRTThreadedAmpSliceClient>::run(argc, argv);
 }

src/fluid-hpss/fluid-hpss.cpp

@@ -15,5 +15,5 @@ under the European Union’s Horizon 2020 research and innovation programme
 int main(int argc, const char* argv[])
 {
   using namespace fluid::client;
-  return CLIWrapper<NRTHPSSClient>::run(argc, argv);
+  return CLIWrapper<NRTThreadedHPSSClient>::run(argc, argv);
 }

src/fluid-loudness/fluid-loudness.cpp

@@ -15,5 +15,5 @@ under the European Union’s Horizon 2020 research and innovation programme
 int main(int argc, const char* argv[])
 {
   using namespace fluid::client;
-  return CLIWrapper<NRTLoudnessClient>::run(argc, argv);
+  return CLIWrapper<NRTThreadedLoudnessClient>::run(argc, argv);
 }

src/fluid-melbands/fluid-melbands.cpp

@@ -15,5 +15,5 @@ under the European Union’s Horizon 2020 research and innovation programme
 int main(int argc, const char* argv[])
 {
   using namespace fluid::client;
-  return CLIWrapper<NRTMelBandsClient>::run(argc, argv);
+  return CLIWrapper<NRTThreadedMelBandsClient>::run(argc, argv);
 }

src/fluid-mfcc/fluid-mfcc.cpp

@@ -15,5 +15,5 @@ under the European Union’s Horizon 2020 research and innovation programme
 int main(int argc, const char* argv[])
 {
   using namespace fluid::client;
-  return CLIWrapper<NRTMFCCClient>::run(argc, argv);
+  return CLIWrapper<NRTThreadedMFCCClient>::run(argc, argv);
 }

src/fluid-nmf/fluid-nmf.cpp

@@ -15,5 +15,5 @@ under the European Union’s Horizon 2020 research and innovation programme
 int main(int argc, const char* argv[])
 {
   using namespace fluid::client;
-  return CLIWrapper<NMFClient>::run(argc, argv);
+  return CLIWrapper<NRTThreadedNMFClient>::run(argc, argv);
 }

src/fluid-noveltyslice/fluid-noveltyslice.cpp

@@ -15,5 +15,5 @@ under the European Union’s Horizon 2020 research and innovation programme
 int main(int argc, const char* argv[])
 {
   using namespace fluid::client;
-  return CLIWrapper<NRTNoveltySliceClient>::run(argc, argv);
+  return CLIWrapper<NRTThreadingNoveltySliceClient>::run(argc, argv);
 }

src/fluid-onsetslice/fluid-onsetslice.cpp

@@ -15,5 +15,5 @@ under the European Union’s Horizon 2020 research and innovation programme
 int main(int argc, const char* argv[])
 {
   using namespace fluid::client;
-  return CLIWrapper<NRTOnsetSliceClient>::run(argc, argv);
+  return CLIWrapper<NRTThreadingOnsetSliceClient>::run(argc, argv);
 }

src/fluid-pitch/fluid-pitch.cpp

@@ -15,5 +15,5 @@ under the European Union’s Horizon 2020 research and innovation programme
 int main(int argc, const char* argv[])
 {
   using namespace fluid::client;
-  return CLIWrapper<NRTPitchClient>::run(argc, argv);
+  return CLIWrapper<NRTThreadedPitchClient>::run(argc, argv);
 }

src/fluid-sines/fluid-sines.cpp

@@ -15,5 +15,5 @@ under the European Union’s Horizon 2020 research and innovation programme
 int main(int argc, const char* argv[])
 {
   using namespace fluid::client;
-  return CLIWrapper<NRTSinesClient>::run(argc, argv);
+  return CLIWrapper<NRTThreadedSinesClient>::run(argc, argv);
 }

src/fluid-spectralshape/fluid-spectralshape.cpp

@@ -15,5 +15,5 @@ under the European Union’s Horizon 2020 research and innovation programme
 int main(int argc, const char* argv[])
 {
   using namespace fluid::client;
-  return CLIWrapper<NRTSpectralShapeClient>::run(argc, argv);
+  return CLIWrapper<NRTThreadedSpectralShapeClient>::run(argc, argv);
 }

src/fluid-stats/fluid-stats.cpp

@@ -15,5 +15,5 @@ under the European Union’s Horizon 2020 research and innovation programme
 int main(int argc, const char* argv[])
 {
   using namespace fluid::client;
-  return CLIWrapper<BufStatsClient>::run(argc, argv);
+  return CLIWrapper<NRTThreadedBufStatsClient>::run(argc, argv);
 }

src/fluid-transients/fluid-transients.cpp

@@ -15,5 +15,5 @@ under the European Union’s Horizon 2020 research and innovation programme
 int main(int argc, const char* argv[])
 {
   using namespace fluid::client;
-  return CLIWrapper<NRTTransientsClient>::run(argc, argv);
+  return CLIWrapper<NRTThreadedTransientsClient>::run(argc, argv);
 }

src/fluid-transientslice/fluid-transientslice.cpp

@@ -15,5 +15,7 @@ under the European Union’s Horizon 2020 research and innovation programme
 int main(int argc, const char* argv[])
 {
   using namespace fluid::client;
-  return CLIWrapper<NRTTransientSliceClient>::run(argc, argv);
+  // return CLIWrapper<NRTTransientSliceClient>::run(argc, argv);
+  return CLIWrapper<NRTThreadedTransientSliceClient>::run(argc, argv);
+
 }