[exec] allow to choose commit algorithm in execution_state

ossia · Aug 11, 2023 · 3adabff · 3adabff
1 parent d874640
commit 3adabff
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/3rdparty/libossia b/3rdparty/libossia
diff --git a/src/plugins/score-plugin-engine/Execution/Clock/DataflowClock.cpp b/src/plugins/score-plugin-engine/Execution/Clock/DataflowClock.cpp
@@ -58,6 +58,10 @@ void Clock::play_impl(const TimeVal& t)
     opt.commit = ossia::tick_setup_options::Priorized;
   else if(commit == Execution::Settings::CommitPolicies{}.Merged)
     opt.commit = ossia::tick_setup_options::Merged;
+  else if(commit == Execution::Settings::CommitPolicies{}.MergedThreaded)
+    opt.commit = ossia::tick_setup_options::MergedThreaded;
+  else if(commit == Execution::Settings::CommitPolicies{}.DirectThreaded)
+    opt.commit = ossia::tick_setup_options::DirectThreaded;
 
   if(m_plug.settings.getBench() && m_plug.contextData()->bench)
   {

diff --git a/src/plugins/score-plugin-engine/Execution/Settings/ExecutorModel.hpp b/src/plugins/score-plugin-engine/Execution/Settings/ExecutorModel.hpp
@@ -46,7 +46,12 @@ struct CommitPolicies
   const QString Ordered{"Ordered"};
   const QString Priorized{"Priorized"};
   const QString Merged{"Merged"};
-  operator QStringList() const { return {Default, Ordered, Priorized, Merged}; }
+  const QString MergedThreaded{"MergedThreaded"};
+  const QString DirectThreaded{"DirectThreaded"};
+  operator QStringList() const
+  {
+    return {Default, Ordered, Priorized, Merged, MergedThreaded, DirectThreaded};
+  }
 };
 struct TickPolicies
 {
+21 −1		src/ossia/dataflow/execution_state.cpp
+3 −1		src/ossia/dataflow/graph/graph_interface.hpp