1 files changed, 21 insertions, 27 deletions

diff --git a/src/server/events/CreateBlock.cpp b/src/server/events/CreateBlock.cpp
index 23a0d35e..55c9b782 100644
--- a/src/server/events/CreateBlock.cpp
+++ b/src/server/events/CreateBlock.cpp
@@ -28,32 +28,27 @@
 #include "State.hpp"
 #include "types.hpp"
 
-#include "ingen/FilePath.hpp"
-#include "ingen/Forge.hpp"
-#include "ingen/Interface.hpp"
-#include "ingen/Node.hpp"
-#include "ingen/Properties.hpp"
-#include "ingen/Resource.hpp"
-#include "ingen/Status.hpp"
-#include "ingen/Store.hpp"
-#include "ingen/URI.hpp"
-#include "ingen/URIs.hpp"
-#include "ingen/World.hpp"
-#include "ingen/paths.hpp"
-#include "raul/Maid.hpp"
-#include "raul/Path.hpp"
-#include "raul/Symbol.hpp"
+#include <ingen/FilePath.hpp>
+#include <ingen/Forge.hpp>
+#include <ingen/Interface.hpp>
+#include <ingen/Node.hpp>
+#include <ingen/Properties.hpp>
+#include <ingen/Resource.hpp>
+#include <ingen/Status.hpp>
+#include <ingen/Store.hpp>
+#include <ingen/URI.hpp>
+#include <ingen/URIs.hpp>
+#include <ingen/World.hpp>
+#include <ingen/paths.hpp>
+#include <raul/Path.hpp>
+#include <raul/Symbol.hpp>
 
 #include <map>
 #include <memory>
+#include <string>
 #include <utility>
 
-namespace ingen {
-namespace server {
-
-class RunContext;
-
-namespace events {
+namespace ingen::server::events {
 
 CreateBlock::CreateBlock(Engine&                           engine,
                          const std::shared_ptr<Interface>& client,
@@ -170,7 +165,7 @@ CreateBlock::pre_process(PreProcessContext& ctx)
 	/* Compile graph with new block added for insertion in audio thread
 	   TODO: Since the block is not connected at this point, a full compilation
 	   could be avoided and the block simply appended. */
-	_compiled_graph = ctx.maybe_compile(*_engine.maid(), *_graph);
+	_compiled_graph = ctx.maybe_compile(*_graph);
 
 	_update.put_block(_block);
 
@@ -181,14 +176,15 @@ void
 CreateBlock::execute(RunContext&)
 {
 	if (_status == Status::SUCCESS && _compiled_graph) {
-		_graph->set_compiled_graph(std::move(_compiled_graph));
+		_compiled_graph =
+		    _graph->swap_compiled_graph(std::move(_compiled_graph));
 	}
 }
 
 void
 CreateBlock::post_process()
 {
-	Broadcaster::Transfer t(*_engine.broadcaster());
+	const Broadcaster::Transfer t{*_engine.broadcaster()};
 	if (respond() == Status::SUCCESS) {
 		_update.send(*_engine.broadcaster());
 	}
@@ -200,6 +196,4 @@ CreateBlock::undo(Interface& target)
 	target.del(_block->uri());
 }
 
-} // namespace events
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server::events