1 files changed, 39 insertions, 29 deletions

diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp
index 2335c09f..45e7ea94 100644
--- a/src/server/events/Get.cpp
+++ b/src/server/events/Get.cpp
@@ -18,47 +18,53 @@
 
 #include "BlockImpl.hpp"
 #include "Broadcaster.hpp"
-#include "BufferFactory.hpp"
 #include "Engine.hpp"
 #include "GraphImpl.hpp"
-#include "PluginImpl.hpp"
 #include "PortImpl.hpp"
 
-#include "ingen/Forge.hpp"
-#include "ingen/Interface.hpp"
-#include "ingen/Node.hpp"
-#include "ingen/Store.hpp"
-#include "ingen/World.hpp"
+#include <ingen/Forge.hpp>
+#include <ingen/Interface.hpp>
+#include <ingen/Message.hpp>
+#include <ingen/Node.hpp>
+#include <ingen/Properties.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 <cstdint>
+#include <memory>
 #include <mutex>
+#include <utility>
 
-namespace ingen {
-namespace server {
-namespace events {
+namespace ingen::server::events {
 
-Get::Get(Engine&                engine,
-         const SPtr<Interface>& client,
-         SampleCount            timestamp,
-         const ingen::Get&      msg)
+Get::Get(Engine&                           engine,
+         const std::shared_ptr<Interface>& client,
+         SampleCount                       timestamp,
+         const ingen::Get&                 msg)
 	: Event(engine, client, msg.seq, timestamp)
 	, _msg(msg)
-	, _object(nullptr)
-	, _plugin(nullptr)
 {}
 
 bool
 Get::pre_process(PreProcessContext&)
 {
-	std::lock_guard<Store::Mutex> lock(_engine.store()->mutex());
+	const std::lock_guard<Store::Mutex> lock{_engine.store()->mutex()};
 
 	const auto& uri = _msg.subject;
 	if (uri == "ingen:/plugins") {
 		_plugins = _engine.block_factory()->plugins();
 		return Event::pre_process_done(Status::SUCCESS);
-	} else if (uri == "ingen:/engine") {
+	}
+
+	if (uri == "ingen:/engine") {
 		return Event::pre_process_done(Status::SUCCESS);
-	} else if (uri_is_path(uri)) {
+	}
+
+	if (uri_is_path(uri)) {
 		if ((_object = _engine.store()->get(uri_to_path(uri)))) {
 			const BlockImpl* block = nullptr;
 			const GraphImpl* graph = nullptr;
@@ -75,18 +81,24 @@ Get::pre_process(PreProcessContext&)
 			return Event::pre_process_done(Status::SUCCESS);
 		}
 		return Event::pre_process_done(Status::NOT_FOUND, uri);
-	} else if ((_plugin = _engine.block_factory()->plugin(uri))) {
+	}
+
+	if ((_plugin = _engine.block_factory()->plugin(uri))) {
 		_response.put_plugin(_plugin);
 		return Event::pre_process_done(Status::SUCCESS);
-	} else {
-		return Event::pre_process_done(Status::NOT_FOUND, uri);
 	}
+
+	return Event::pre_process_done(Status::NOT_FOUND, uri);
 }
 
 void
+Get::execute(RunContext&)
+{}
+
+void
 Get::post_process()
 {
-	Broadcaster::Transfer t(*_engine.broadcaster());
+	const Broadcaster::Transfer t{*_engine.broadcaster()};
 	if (respond() == Status::SUCCESS && _request_client) {
 		if (_msg.subject == "ingen:/plugins") {
 			_engine.broadcaster()->send_plugins_to(_request_client.get(), _plugins);
@@ -95,11 +107,11 @@ Get::post_process()
 			URIs&      uris  = _engine.world().uris();
 			Properties props = {
 				{ uris.param_sampleRate,
-				  uris.forge.make(int32_t(_engine.sample_rate())) },
+				  uris.forge.make(static_cast<int32_t>(_engine.sample_rate())) },
 				{ uris.bufsz_maxBlockLength,
-				  uris.forge.make(int32_t(_engine.block_length())) },
+				  uris.forge.make(static_cast<int32_t>(_engine.block_length())) },
 				{ uris.ingen_numThreads,
-				  uris.forge.make(int32_t(_engine.n_threads())) } };
+				  uris.forge.make(static_cast<int32_t>(_engine.n_threads())) } };
 
 			const Properties load_props = _engine.load_properties();
 			props.insert(load_props.begin(), load_props.end());
@@ -110,6 +122,4 @@ Get::post_process()
 	}
 }
 
-} // namespace events
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server::events