[ci] Fix example build and build outside of score

ossia · Sep 23, 2023 · fb42ca5 · fb42ca5
1 parent d792d7f
commit fb42ca5
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/examples/Dataflow/MiniDAW.cpp b/examples/Dataflow/MiniDAW.cpp
@@ -72,7 +72,7 @@ struct tick
       auto log = g_exec_log.start_commit();
 #endif
 
-      st.commit_merged();
+      st.commit();
     }
   }
 };

diff --git a/src/ossia/dataflow/execution/execution_policy.cpp b/src/ossia/dataflow/execution/execution_policy.cpp
@@ -13,7 +13,6 @@
 #include <ossia/protocols/midi/midi_device.hpp>
 #include <ossia/protocols/midi/midi_protocol.hpp>
 
-#include <QDebug>
 namespace ossia
 {
 

diff --git a/src/ossia/dataflow/execution_state.cpp b/src/ossia/dataflow/execution_state.cpp
@@ -18,7 +18,9 @@
 
 namespace ossia
 {
-execution_state::execution_state() { }
+execution_state::execution_state() {
+  m_policy = std::make_unique<merged_execution_state_policy>();
+}
 
 execution_state::~execution_state() { }
 

diff --git a/src/ossia/network/oscquery/detail/typetag.cpp b/src/ossia/network/oscquery/detail/typetag.cpp
@@ -2,6 +2,7 @@
 // it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 #include <ossia/network/oscquery/detail/typetag.hpp>
 
+#include <oscpack/osc/OscTypes.h>
 namespace ossia::oscquery
 {
 

diff --git a/src/ossia/network/oscquery/detail/typetag.hpp b/src/ossia/network/oscquery/detail/typetag.hpp
@@ -7,7 +7,6 @@
 #include <ossia/network/dataspace/dataspace_visitors.hpp>
 #include <ossia/network/value/value.hpp>
 
-#include <oscpack/osc/OscTypes.h>
 namespace ossia::oscquery
 {
 //! Returns the OSC Typetag associated to an ossia node, if there is a value
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,7 +72,7 @@ struct tick @@
           auto log = g_exec_log.start_commit();
     #endif
-          st.commit_merged();
+          st.commit();
         }
       }
     };
@@ Expand Down @@