From cc672193b82a4b314d59aa2e572a5e9667c34f1b Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 9 Mar 2019 17:44:36 +0100
Subject: WIP: Port to serd1

---
 src/server/Engine.cpp | 59 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 26 deletions(-)

(limited to 'src/server/Engine.cpp')

diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp
index f93c7fe5..61c414a1 100644
--- a/src/server/Engine.cpp
+++ b/src/server/Engine.cpp
@@ -68,31 +68,37 @@ INGEN_THREAD_LOCAL unsigned ThreadManager::flags(0);
 bool               ThreadManager::single_threaded(true);
 
 Engine::Engine(ingen::World& world)
-	: _world(world)
-	, _options(new LV2Options(world.uris()))
-	, _buffer_factory(new BufferFactory(*this, world.uris()))
-	, _maid(new Raul::Maid)
-	, _worker(new Worker(world.log(), event_queue_size()))
-	, _sync_worker(new Worker(world.log(), event_queue_size(), true))
-	, _broadcaster(new Broadcaster())
-	, _control_bindings(new ControlBindings(*this))
-	, _block_factory(new BlockFactory(world))
-	, _undo_stack(new UndoStack(world.uris(), world.uri_map()))
-	, _redo_stack(new UndoStack(world.uris(), world.uri_map()))
-	, _post_processor(new PostProcessor(*this))
-	, _pre_processor(new PreProcessor(*this))
-	, _event_writer(new EventWriter(*this))
-	, _interface(_event_writer)
-	, _atom_interface(
-		new AtomReader(world.uri_map(), world.uris(), world.log(), *_interface))
-	, _root_graph(nullptr)
-	, _cycle_start_time(0)
-	, _rand_engine(0)
-	, _uniform_dist(0.0f, 1.0f)
-	, _quit_flag(false)
-	, _reset_load_flag(false)
-	, _atomic_bundles(world.conf().option("atomic-bundles").get<int32_t>())
-	, _activated(false)
+    : _world(world)
+    , _options(new LV2Options(world.uris()))
+    , _buffer_factory(new BufferFactory(*this, world.uris()))
+    , _maid(new Raul::Maid)
+    , _worker(new Worker(world.log(), event_queue_size()))
+    , _sync_worker(new Worker(world.log(), event_queue_size(), true))
+    , _broadcaster(new Broadcaster())
+    , _control_bindings(new ControlBindings(*this))
+    , _block_factory(new BlockFactory(world))
+    , _undo_stack(new UndoStack(world.rdf_world(),
+                                world.uris(),
+                                world.uri_map()))
+    , _redo_stack(new UndoStack(world.rdf_world(),
+                                world.uris(),
+                                world.uri_map()))
+    , _post_processor(new PostProcessor(*this))
+    , _pre_processor(new PreProcessor(*this))
+    , _event_writer(new EventWriter(*this))
+    , _interface(_event_writer)
+    , _atom_interface(new AtomReader(world.uri_map(),
+                                     world.uris(),
+                                     world.log(),
+                                     *_interface))
+    , _root_graph(nullptr)
+    , _cycle_start_time(0)
+    , _rand_engine(0)
+    , _uniform_dist(0.0f, 1.0f)
+    , _quit_flag(false)
+    , _reset_load_flag(false)
+    , _atomic_bundles(world.conf().option("atomic-bundles").get<int32_t>())
+    , _activated(false)
 {
 	if (!world.store()) {
 		world.set_store(SPtr<ingen::Store>(new Store()));
@@ -125,7 +131,8 @@ Engine::Engine(ingen::World& world)
 		_interface = std::make_shared<Tee>(
 			Tee::Sinks{
 				_event_writer,
-				std::make_shared<StreamWriter>(world.uri_map(),
+				std::make_shared<StreamWriter>(world.rdf_world(),
+				                               world.uri_map(),
 				                               world.uris(),
 				                               URI("ingen:/engine"),
 				                               stderr,
-- 
cgit v1.2.1