1 files changed, 26 insertions, 24 deletions

diff --git a/src/server/BufferFactory.cpp b/src/server/BufferFactory.cpp
index 4ecdfc3b..b8f6ee35 100644
--- a/src/server/BufferFactory.cpp
+++ b/src/server/BufferFactory.cpp
@@ -19,17 +19,16 @@
 #include "Buffer.hpp"
 #include "Engine.hpp"
 
-#include "ingen/Log.hpp"
-#include "ingen/URIs.hpp"
-#include "ingen/World.hpp"
-#include "lv2/atom/atom.h"
-#include "lv2/urid/urid.h"
+#include <ingen/Log.hpp>
+#include <ingen/URIs.hpp>
+#include <ingen/World.hpp>
+#include <lv2/atom/atom.h>
+#include <lv2/urid/urid.h>
 
 #include <algorithm>
 #include <memory>
 
-namespace ingen {
-namespace server {
+namespace ingen::server {
 
 BufferFactory::BufferFactory(Engine& engine, URIs& uris)
 	: _free_audio(nullptr)
@@ -38,10 +37,8 @@ BufferFactory::BufferFactory(Engine& engine, URIs& uris)
 	, _free_object(nullptr)
 	, _engine(engine)
 	, _uris(uris)
-	, _seq_size(0)
 	, _silent_buffer(nullptr)
-{
-}
+{}
 
 BufferFactory::~BufferFactory()
 {
@@ -101,19 +98,25 @@ BufferFactory::default_size(LV2_URID type) const
 {
 	if (type == _uris.atom_Float) {
 		return sizeof(LV2_Atom_Float);
-	} else if (type == _uris.atom_Sound) {
+	}
+
+	if (type == _uris.atom_Sound) {
 		return audio_buffer_size(_engine.block_length());
-	} else if (type == _uris.atom_URID) {
+	}
+
+	if (type == _uris.atom_URID) {
 		return sizeof(LV2_Atom_URID);
-	} else if (type == _uris.atom_Sequence) {
-		if (_seq_size == 0) {
+	}
+
+	if (type == _uris.atom_Sequence) {
+		if (_seq_size == 0U) {
 			return _engine.sequence_size();
-		} else {
-			return _seq_size;
 		}
-	} else {
-		return 0;
+
+		return _seq_size;
 	}
+
+	return 0;
 }
 
 Buffer*
@@ -146,7 +149,7 @@ BufferFactory::get_buffer(LV2_URID type,
 	try_head->_next = nullptr;
 	try_head->set_type(&BufferFactory::get_buffer, type, value_type);
 	try_head->clear();
-	return BufferRef(try_head);
+	return {try_head};
 }
 
 BufferRef
@@ -155,12 +158,12 @@ BufferFactory::claim_buffer(LV2_URID type, LV2_URID value_type, uint32_t)
 	Buffer* try_head = try_get_buffer(type);
 	if (!try_head) {
 		_engine.world().log().rt_error("Failed to obtain buffer");
-		return BufferRef();
+		return {};
 	}
 
 	try_head->_next = nullptr;
 	try_head->set_type(&BufferFactory::claim_buffer, type, value_type);
-	return BufferRef(try_head);
+	return {try_head};
 }
 
 BufferRef
@@ -181,7 +184,7 @@ BufferFactory::create(LV2_URID type, LV2_URID value_type, uint32_t capacity)
 		capacity = std::max(capacity, default_size(_uris.atom_Sound));
 	}
 
-	return BufferRef(new Buffer(*this, type, value_type, capacity));
+	return {new Buffer(*this, type, value_type, capacity)};
 }
 
 void
@@ -195,5 +198,4 @@ BufferFactory::recycle(Buffer* buf)
 	} while (!head_ptr.compare_exchange_weak(try_head, buf));
 }
 
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server