From 81e9fb3245bd461ebfee4cfa16d1792e48533f9e Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Mon, 12 Mar 2012 06:59:48 +0000
Subject: Centralise atom creation in forge object.

Aside from being more greppable and making realtime violations more obvious, this is a step towards using LV2 atoms internally (which needs a factory since the type numbers are dynamic).


git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4054 a436a847-0d15-0410-975c-d299462d15a1
---
 include/ingen/shared/Configuration.hpp | 2 +-
 include/ingen/shared/URIs.hpp          | 8 +++++++-
 include/ingen/shared/World.hpp         | 2 ++
 3 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'include/ingen/shared')

diff --git a/include/ingen/shared/Configuration.hpp b/include/ingen/shared/Configuration.hpp
index e51bdc71..21bc5737 100644
--- a/include/ingen/shared/Configuration.hpp
+++ b/include/ingen/shared/Configuration.hpp
@@ -25,7 +25,7 @@ namespace Shared {
 
 class Configuration : public Raul::Configuration {
 public:
-	Configuration();
+	Configuration(Raul::Forge* forge);
 };
 
 } // namespace Shared
diff --git a/include/ingen/shared/URIs.hpp b/include/ingen/shared/URIs.hpp
index 405f1276..01464589 100644
--- a/include/ingen/shared/URIs.hpp
+++ b/include/ingen/shared/URIs.hpp
@@ -22,12 +22,16 @@
 
 #include "raul/URI.hpp"
 
+namespace Raul {
+	class Forge;
+}
+
 namespace Ingen {
 namespace Shared {
 
 class URIs : public boost::noncopyable {
 public:
-	URIs();
+	URIs(Raul::Forge& forge);
 
 	uint32_t    map_uri(const char* uri);
 	const char* unmap_uri(uint32_t urid);
@@ -38,6 +42,8 @@ public:
 		uint32_t id;
 	};
 
+	Raul::Forge& forge;
+
 	const Quark atom_Bool;
 	const Quark atom_Float;
 	const Quark atom_Int32;
diff --git a/include/ingen/shared/World.hpp b/include/ingen/shared/World.hpp
index ef67c30b..fba565e5 100644
--- a/include/ingen/shared/World.hpp
+++ b/include/ingen/shared/World.hpp
@@ -102,6 +102,8 @@ public:
 	virtual Raul::Configuration* conf();
 	virtual void set_conf(Raul::Configuration* c);
 
+	virtual Raul::Forge& forge();
+
 	virtual LV2Features* lv2_features();
 
 	virtual LilvWorld* lilv_world();
-- 
cgit v1.2.1