Remove redundant pointer get() calls

5 files changed, 6 insertions, 6 deletions

diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp
index efc152d5..0d5a57bb 100644
--- a/src/server/Engine.cpp
+++ b/src/server/Engine.cpp
@@ -161,7 +161,7 @@ Engine::~Engine()
 
 	const SPtr<Store> store = this->store();
 	if (store) {
-		for (auto& s : *store.get()) {
+		for (auto& s : *store) {
 			if (!std::dynamic_pointer_cast<NodeImpl>(s.second)->parent()) {
 				s.second.reset();
 			}
diff --git a/src/server/SocketServer.hpp b/src/server/SocketServer.hpp
index 26e1456b..9f762ddf 100644
--- a/src/server/SocketServer.hpp
+++ b/src/server/SocketServer.hpp
@@ -49,7 +49,7 @@ public:
 					                                          stderr,
 					                                          ColorContext::Color::CYAN))}))
 		        : SPtr<Interface>(new EventWriter(engine)))
-		, _reader(new SocketReader(world, *_sink.get(), sock))
+		, _reader(new SocketReader(world, *_sink, sock))
 		, _writer(new SocketWriter(world.uri_map(),
 		                           world.uris(),
 		                           URI(sock->uri()),
diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp
index eabcad73..b269ca45 100644
--- a/src/server/events/Connect.cpp
+++ b/src/server/events/Connect.cpp
@@ -154,7 +154,7 @@ void
 Connect::execute(RunContext& ctx)
 {
 	if (_status == Status::SUCCESS) {
-		_head->add_arc(ctx, *_arc.get());
+		_head->add_arc(ctx, *_arc);
 		if (!_head->is_driver_port()) {
 			_head->set_voices(ctx, std::move(_voices));
 		}
diff --git a/src/server/events/Disconnect.cpp b/src/server/events/Disconnect.cpp
index 2c689a6a..3df5fd64 100644
--- a/src/server/events/Disconnect.cpp
+++ b/src/server/events/Disconnect.cpp
@@ -171,7 +171,7 @@ Disconnect::Impl::execute(RunContext& ctx, bool set_head_buffers)
 		return false;
 	}
 
-	_head->remove_arc(*_arc.get());
+	_head->remove_arc(*_arc);
 	if (_head->is_driver_port()) {
 		return true;
 	}
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index e5abcc92..ed86ee03 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -119,7 +119,7 @@ public:
 		, _reader(engine.world().uri_map(),
 		          engine.world().uris(),
 		          engine.world().log(),
-		          *engine.world().interface().get())
+		          *engine.world().interface())
 		, _writer(engine.world().uri_map(),
 		          engine.world().uris(),
 		          *this)
@@ -583,7 +583,7 @@ ingen_instantiate(const LV2_Descriptor*    descriptor,
 	server::ThreadManager::set_flag(server::THREAD_PRE_PROCESS);
 	server::ThreadManager::single_threaded = true;
 
-	auto* driver = new LV2Driver(*engine.get(), block_length, seq_size, rate);
+	auto* driver = new LV2Driver(*engine, block_length, seq_size, rate);
 	engine->set_driver(SPtr<ingen::server::Driver>(driver));
 
 	engine->activate();