1 files changed, 15 insertions, 59 deletions

diff --git a/include/ingen/AtomForge.hpp b/include/ingen/AtomForge.hpp
index cf5a759d..b1e5a5df 100644
--- a/include/ingen/AtomForge.hpp
+++ b/include/ingen/AtomForge.hpp
@@ -17,55 +17,41 @@
 #ifndef INGEN_ATOMFORGE_HPP
 #define INGEN_ATOMFORGE_HPP
 
+#include "ingen/ingen.h"
 #include "ingen/memory.hpp"
 #include "lv2/atom/atom.h"
 #include "lv2/atom/forge.h"
-#include "lv2/atom/util.h"
 #include "lv2/urid/urid.h"
 #include "sord/sord.h"
-#include "sord/sordmm.hpp"
 #include "sratom/sratom.h"
 
-#include <cassert>
 #include <cstdint>
 #include <cstdlib>
-#include <cstring>
 #include <memory>
 
+namespace Sord {
+class World;
+} // namespace Sord
+
 namespace ingen {
 
 /// An atom forge that writes to an automatically-resized memory buffer
-class AtomForge : public LV2_Atom_Forge
+class INGEN_API AtomForge : public LV2_Atom_Forge
 {
 public:
-	explicit AtomForge(LV2_URID_Map& map)
-		: LV2_Atom_Forge{}
-	    , _sratom{sratom_new(&map)}
-	    , _buf{static_cast<LV2_Atom*>(calloc(8, sizeof(LV2_Atom)))}
-	{
-		lv2_atom_forge_init(this, &map);
-		lv2_atom_forge_set_sink(this, c_append, c_deref, this);
-	}
+	explicit AtomForge(LV2_URID_Map& map);
 
 	/// Forge an atom from `node` in `model`
-	void read(Sord::World& world, SordModel* model, const SordNode* node)
-	{
-		sratom_read(_sratom.get(), this, world.c_obj(), model, node);
-	}
+	void read(Sord::World& world, SordModel* model, const SordNode* node);
 
 	/// Return the top-level atom that has been forged
-	const LV2_Atom* atom() const { return _buf.get(); }
+	const LV2_Atom* atom() const;
 
 	/// Clear the atom buffer and reset the forge
-	void clear()
-	{
-		lv2_atom_forge_set_sink(this, c_append, c_deref, this);
-		_size = 0;
-		*_buf = {0U, 0U};
-	}
+	void clear();
 
 	/// Return the internal atom serialiser
-	Sratom& sratom() { return *_sratom; }
+	Sratom& sratom();
 
 private:
 	struct SratomDeleter { void operator()(Sratom* s) { sratom_free(s); } };
@@ -74,46 +60,16 @@ private:
 	using SratomPtr = std::unique_ptr<Sratom, SratomDeleter>;
 
 	/// Append some data and return a reference to its start
-	intptr_t append(const void* data, uint32_t len) {
-		// Record offset of the start of this write (+1 to avoid null)
-		const auto ref = static_cast<intptr_t>(_size + 1U);
-
-		// Update size and reallocate if necessary
-		if (lv2_atom_pad_size(_size + len) > _capacity) {
-			_capacity = lv2_atom_pad_size(_size + len);
-
-			_buf = AtomPtr{static_cast<LV2_Atom*>(
-			                   realloc(_buf.release(), _capacity)),
-			               FreeDeleter<LV2_Atom>{}};
-		}
-
-		// Append new data
-		memcpy(reinterpret_cast<uint8_t*>(_buf.get()) + _size, data, len);
-		_size += len;
-		return ref;
-	}
+	intptr_t append(const void* data, uint32_t len);
 
 	/// Dereference a reference previously returned by append()
-	LV2_Atom* deref(intptr_t ref) {
-		/* Make some assumptions and do unnecessary math to appease
-		   -Wcast-align.  This is questionable at best, though the forge should
-		   only dereference references to aligned atoms. */
-		assert((ref - 1) % sizeof(LV2_Atom) == 0);
-		return static_cast<LV2_Atom*>(_buf.get() + (ref - 1) / sizeof(LV2_Atom));
-
-		// Alternatively:
-		// return (LV2_Atom*)((uint8_t*)_buf + ref - 1);
-	}
+	LV2_Atom* deref(intptr_t ref);
 
 	static LV2_Atom_Forge_Ref
-	c_append(void* self, const void* data, uint32_t len) {
-		return static_cast<AtomForge*>(self)->append(data, len);
-	}
+	c_append(void* self, const void* data, uint32_t len);
 
 	static LV2_Atom*
-	c_deref(void* self, LV2_Atom_Forge_Ref ref) {
-		return static_cast<AtomForge*>(self)->deref(ref);
-	}
+	c_deref(void* self, LV2_Atom_Forge_Ref ref);
 
 	size_t    _size{0};                        ///< Current atom size
 	size_t    _capacity{8 * sizeof(LV2_Atom)}; ///< Allocated size of buffer