1 files changed, 27 insertions, 27 deletions

diff --git a/src/server/GraphImpl.cpp b/src/server/GraphImpl.cpp
index a668312d..9e44a4d4 100644
--- a/src/server/GraphImpl.cpp
+++ b/src/server/GraphImpl.cpp
@@ -28,24 +28,24 @@
 #include "PortImpl.hpp"
 #include "ThreadManager.hpp"
 
-#include "ingen/Forge.hpp"
-#include "ingen/Properties.hpp"
-#include "ingen/URIs.hpp"
-#include "ingen/World.hpp"
-#include "lv2/urid/urid.h"
-#include "raul/Array.hpp"
-#include "raul/Maid.hpp"
-#include "raul/Symbol.hpp"
+#include <ingen/Forge.hpp>
+#include <ingen/Properties.hpp>
+#include <ingen/URI.hpp>
+#include <ingen/URIs.hpp>
+#include <ingen/World.hpp>
+#include <lv2/urid/urid.h>
+#include <raul/Array.hpp>
+#include <raul/Maid.hpp>
+#include <raul/Symbol.hpp>
 
 #include <cassert>
 #include <cstddef>
 #include <map>
 #include <memory>
-#include <type_traits>
+#include <string>
 #include <unordered_map>
 
-namespace ingen {
-namespace server {
+namespace ingen::server {
 
 GraphImpl::GraphImpl(Engine&             engine,
                      const raul::Symbol& symbol,
@@ -61,7 +61,6 @@ GraphImpl::GraphImpl(Engine&             engine,
 	, _engine(engine)
 	, _poly_pre(internal_poly)
 	, _poly_process(internal_poly)
-	, _process(false)
 {
 	assert(internal_poly >= 1);
 	assert(internal_poly <= 128);
@@ -123,7 +122,7 @@ GraphImpl::duplicate(Engine&             engine,
 	}
 
 	// Add duplicates of all arcs
-	for (const auto& a : _arcs) {
+	for (const auto& a : _graph_arcs) {
 		auto arc = std::dynamic_pointer_cast<ArcImpl>(a.second);
 		if (arc) {
 			auto t = port_map.find(arc->tail());
@@ -286,38 +285,40 @@ void
 GraphImpl::add_arc(const std::shared_ptr<ArcImpl>& a)
 {
 	ThreadManager::assert_thread(THREAD_PRE_PROCESS);
-	_arcs.emplace(std::make_pair(a->tail(), a->head()), a);
+	_graph_arcs.emplace(std::make_pair(a->tail(), a->head()), a);
 }
 
 std::shared_ptr<ArcImpl>
 GraphImpl::remove_arc(const PortImpl* tail, const PortImpl* dst_port)
 {
 	ThreadManager::assert_thread(THREAD_PRE_PROCESS);
-	auto i = _arcs.find(std::make_pair(tail, dst_port));
-	if (i != _arcs.end()) {
+	auto i = _graph_arcs.find(std::make_pair(tail, dst_port));
+	if (i != _graph_arcs.end()) {
 		auto arc = std::dynamic_pointer_cast<ArcImpl>(i->second);
-		_arcs.erase(i);
+		_graph_arcs.erase(i);
 		return arc;
-	} else {
-		return nullptr;
 	}
+
+	return nullptr;
 }
 
 bool
 GraphImpl::has_arc(const PortImpl* tail, const PortImpl* dst_port) const
 {
 	ThreadManager::assert_thread(THREAD_PRE_PROCESS);
-	auto i = _arcs.find(std::make_pair(tail, dst_port));
-	return (i != _arcs.end());
+	auto i = _graph_arcs.find(std::make_pair(tail, dst_port));
+	return (i != _graph_arcs.end());
 }
 
-void
-GraphImpl::set_compiled_graph(raul::managed_ptr<CompiledGraph>&& cg)
+std::unique_ptr<CompiledGraph>
+GraphImpl::swap_compiled_graph(std::unique_ptr<CompiledGraph> cg)
 {
 	if (_compiled_graph && _compiled_graph != cg) {
 		_engine.reset_load();
 	}
-	_compiled_graph = std::move(cg);
+
+	_compiled_graph.swap(cg);
+	return cg;
 }
 
 uint32_t
@@ -331,7 +332,7 @@ bool
 GraphImpl::has_port_with_index(uint32_t index) const
 {
 	BufferFactory& bufs       = *_engine.buffer_factory();
-	const auto     index_atom = bufs.forge().make(int32_t(index));
+	const auto     index_atom = bufs.forge().make(static_cast<int32_t>(index));
 
 	for (const auto& p : _inputs) {
 		if (p.has_property(bufs.uris().lv2_index, index_atom)) {
@@ -391,5 +392,4 @@ GraphImpl::build_ports_array(raul::Maid& maid)
 	return result;
 }
 
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server