1 files changed, 25 insertions, 18 deletions

diff --git a/src/server/BufferFactory.hpp b/src/server/BufferFactory.hpp
index 03a85d1c..dbadaede 100644
--- a/src/server/BufferFactory.hpp
+++ b/src/server/BufferFactory.hpp
@@ -17,18 +17,20 @@
 #ifndef INGEN_ENGINE_BUFFERFACTORY_HPP
 #define INGEN_ENGINE_BUFFERFACTORY_HPP
 
-#include "ingen/URIs.hpp"
-#include "ingen/ingen.h"
-#include "lv2/urid/urid.h"
-
 #include "BufferRef.hpp"
+#include "server.h"
 #include "types.hpp"
 
+#include <ingen/URIs.hpp>
+#include <lv2/urid/urid.h>
+
 #include <atomic>
-#include <mutex>
 #include <cstdint>
+#include <mutex>
 
-namespace Raul { class Maid; }
+namespace raul {
+class Maid;
+} // namespace raul
 
 namespace ingen {
 
@@ -39,7 +41,8 @@ namespace server {
 class Buffer;
 class Engine;
 
-class INGEN_API BufferFactory {
+class INGEN_SERVER_API BufferFactory
+{
 public:
 	BufferFactory(Engine& engine, URIs& uris);
 	~BufferFactory();
@@ -71,7 +74,7 @@ public:
 	void set_seq_size(uint32_t seq_size) { _seq_size = seq_size; }
 
 	Forge&      forge();
-	Raul::Maid& maid();
+	raul::Maid& maid();
 
 	URIs&   uris()   { return _uris; }
 	Engine& engine() { return _engine; }
@@ -82,29 +85,33 @@ private:
 
 	Buffer* try_get_buffer(LV2_URID type);
 
-	inline std::atomic<Buffer*>& free_list(LV2_URID type) {
+	std::atomic<Buffer*>& free_list(LV2_URID type) {
 		if (type == _uris.atom_Float) {
 			return _free_control;
-		} else if (type == _uris.atom_Sound) {
+		}
+
+		if (type == _uris.atom_Sound) {
 			return _free_audio;
-		} else if (type == _uris.atom_Sequence) {
+		}
+
+		if (type == _uris.atom_Sequence) {
 			return _free_sequence;
-		} else {
-			return _free_object;
 		}
+
+		return _free_object;
 	}
 
 	static void free_list(Buffer* head);
 
-	std::atomic<Buffer*> _free_audio;
-	std::atomic<Buffer*> _free_control;
-	std::atomic<Buffer*> _free_sequence;
-	std::atomic<Buffer*> _free_object;
+	std::atomic<Buffer*> _free_audio{nullptr};
+	std::atomic<Buffer*> _free_control{nullptr};
+	std::atomic<Buffer*> _free_sequence{nullptr};
+	std::atomic<Buffer*> _free_object{nullptr};
 
 	std::mutex  _mutex;
 	Engine&     _engine;
 	URIs&       _uris;
-	uint32_t    _seq_size;
+	uint32_t    _seq_size{0U};
 
 	BufferRef _silent_buffer;
 };