Separate URIs from LV2URIMap.

git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3564 a436a847-0d15-0410-975c-d299462d15a1

9 files changed, 29 insertions, 27 deletions

diff --git a/include/ingen/client/ClientStore.hpp b/include/ingen/client/ClientStore.hpp
index a2cb5346..1a93f8e1 100644
--- a/include/ingen/client/ClientStore.hpp
+++ b/include/ingen/client/ClientStore.hpp
@@ -56,7 +56,7 @@ class ClientStore : public Shared::Store
                   , public INGEN_TRACKABLE {
 public:
 	ClientStore(
-		SharedPtr<Shared::LV2URIMap>  uris,
+		SharedPtr<Shared::URIs>       uris,
 		SharedPtr<ServerInterface>    engine=SharedPtr<ServerInterface>(),
 		SharedPtr<SigClientInterface> emitter=SharedPtr<SigClientInterface>());
 
@@ -71,7 +71,7 @@ public:
 	SharedPtr<Plugins>       plugins()                         { return _plugins; }
 	void                     set_plugins(SharedPtr<Plugins> p) { _plugins = p; }
 
-	Shared::LV2URIMap& uris() { return *_uris.get(); }
+	Shared::URIs& uris() { return *_uris.get(); }
 
 	void put(const Raul::URI&            uri,
 	         const Resource::Properties& properties,
@@ -126,7 +126,7 @@ private:
 	bool attempt_connection(const Raul::Path& src_port_path,
 	                        const Raul::Path& dst_port_path);
 
-	SharedPtr<Shared::LV2URIMap>  _uris;
+	SharedPtr<Shared::URIs>       _uris;
 	SharedPtr<ServerInterface>    _engine;
 	SharedPtr<SigClientInterface> _emitter;
 
diff --git a/include/ingen/client/NodeModel.hpp b/include/ingen/client/NodeModel.hpp
index c874e6fb..ef04be90 100644
--- a/include/ingen/client/NodeModel.hpp
+++ b/include/ingen/client/NodeModel.hpp
@@ -34,7 +34,7 @@ namespace Raul { class Path; }
 
 namespace Ingen {
 
-namespace Shared { class LV2URIMap; }
+namespace Shared { class URIs; }
 
 namespace Client {
 
@@ -80,10 +80,10 @@ public:
 protected:
 	friend class ClientStore;
 
-	NodeModel(Shared::LV2URIMap&     uris,
+	NodeModel(Shared::URIs&          uris,
 	          const Raul::URI&       plugin_uri,
 	          const Raul::Path&      path);
-	NodeModel(Shared::LV2URIMap&     uris,
+	NodeModel(Shared::URIs&          uris,
 	          SharedPtr<PluginModel> plugin,
 	          const Raul::Path&      path);
 	NodeModel(const Raul::Path& path);
diff --git a/include/ingen/client/ObjectModel.hpp b/include/ingen/client/ObjectModel.hpp
index 6d4fbae5..ec2c319a 100644
--- a/include/ingen/client/ObjectModel.hpp
+++ b/include/ingen/client/ObjectModel.hpp
@@ -32,7 +32,7 @@
 
 namespace Ingen {
 
-namespace Shared { class LV2URIMap; }
+namespace Shared { class URIs; }
 
 namespace Client {
 
@@ -84,7 +84,7 @@ public:
 protected:
 	friend class ClientStore;
 
-	ObjectModel(Shared::LV2URIMap& uris, const Raul::Path& path);
+	ObjectModel(Shared::URIs& uris, const Raul::Path& path);
 	ObjectModel(const ObjectModel& copy);
 
 	virtual void set_path(const Raul::Path& p);
diff --git a/include/ingen/client/PatchModel.hpp b/include/ingen/client/PatchModel.hpp
index 3e873cfc..023a1dc2 100644
--- a/include/ingen/client/PatchModel.hpp
+++ b/include/ingen/client/PatchModel.hpp
@@ -71,7 +71,7 @@ public:
 private:
 	friend class ClientStore;
 
-	PatchModel(Shared::LV2URIMap& uris, const Raul::Path& patch_path)
+	PatchModel(Shared::URIs& uris, const Raul::Path& patch_path)
 		: NodeModel(uris, "http://drobilla.net/ns/ingen#Patch", patch_path)
 		, _connections(new Connections())
 		, _editable(true)
diff --git a/include/ingen/client/PluginModel.hpp b/include/ingen/client/PluginModel.hpp
index 8eb53b74..bae17994 100644
--- a/include/ingen/client/PluginModel.hpp
+++ b/include/ingen/client/PluginModel.hpp
@@ -31,7 +31,7 @@
 
 namespace Ingen {
 
-namespace Shared { class LV2URIMap; }
+namespace Shared { class URIs; }
 
 namespace Client {
 
@@ -47,11 +47,10 @@ class PluginModel : public Ingen::Plugin
                   , public Ingen::Shared::ResourceImpl
 {
 public:
-	PluginModel(
-			Shared::LV2URIMap&                 uris,
-			const Raul::URI&                   uri,
-			const Raul::URI&                   type_uri,
-			const Ingen::Resource::Properties& properties);
+	PluginModel(Shared::URIs&                      uris,
+	            const Raul::URI&                   uri,
+	            const Raul::URI&                   type_uri,
+	            const Ingen::Resource::Properties& properties);
 
 	Type type() const { return _type; }
 
diff --git a/include/ingen/client/PortModel.hpp b/include/ingen/client/PortModel.hpp
index 900d576e..50219739 100644
--- a/include/ingen/client/PortModel.hpp
+++ b/include/ingen/client/PortModel.hpp
@@ -87,7 +87,7 @@ public:
 private:
 	friend class ClientStore;
 
-	PortModel(Shared::LV2URIMap& uris,
+	PortModel(Shared::URIs& uris,
 	          const Raul::Path&  path,
 	          uint32_t           index,
 	          Direction          dir)
diff --git a/include/ingen/shared/Builder.hpp b/include/ingen/shared/Builder.hpp
index 8a21dee0..245b3013 100644
--- a/include/ingen/shared/Builder.hpp
+++ b/include/ingen/shared/Builder.hpp
@@ -27,7 +27,7 @@ class GraphObject;
 
 namespace Shared {
 
-class LV2URIMap;
+class URIs;
 
 /** Wrapper for CommonInterface to create existing objects/models.
  *
@@ -36,7 +36,7 @@ class LV2URIMap;
 class Builder
 {
 public:
-	Builder(SharedPtr<Shared::LV2URIMap> uris, CommonInterface& interface);
+	Builder(SharedPtr<Shared::URIs> uris, CommonInterface& interface);
 	virtual ~Builder() {}
 
 	void build(SharedPtr<const GraphObject> object);
@@ -45,8 +45,8 @@ public:
 private:
 	void build_object(SharedPtr<const GraphObject> object);
 
-	SharedPtr<Shared::LV2URIMap> _uris;
-	CommonInterface&             _interface;
+	SharedPtr<Shared::URIs> _uris;
+	CommonInterface&        _interface;
 };
 
 } // namespace Shared
diff --git a/include/ingen/shared/LV2Atom.hpp b/include/ingen/shared/LV2Atom.hpp
index df9ffde9..0aa35889 100644
--- a/include/ingen/shared/LV2Atom.hpp
+++ b/include/ingen/shared/LV2Atom.hpp
@@ -25,15 +25,15 @@ namespace Raul { class Atom; }
 namespace Ingen {
 namespace Shared {
 
-class LV2URIMap;
+class URIs;
 
 namespace LV2Atom {
 
-bool to_atom(const LV2URIMap& uris,
-             const LV2_Atom*  object,
-             Raul::Atom&      atom);
+bool to_atom(const URIs&     uris,
+             const LV2_Atom* object,
+             Raul::Atom&     atom);
 
-bool from_atom(const LV2URIMap&  uris,
+bool from_atom(const URIs&       uris,
                const Raul::Atom& atom,
                LV2_Atom*         object);
 
diff --git a/include/ingen/shared/World.hpp b/include/ingen/shared/World.hpp
index 4f0a00c2..4ee378c6 100644
--- a/include/ingen/shared/World.hpp
+++ b/include/ingen/shared/World.hpp
@@ -41,6 +41,7 @@ namespace Serialisation { class Serialiser; class Parser; }
 namespace Shared {
 
 class LV2Features;
+class URIs;
 class LV2URIMap;
 class Store;
 
@@ -92,8 +93,10 @@ public:
 	virtual SharedPtr<Store>                     store();
 	virtual SharedPtr<ClientInterface>           client();
 
-	virtual Sord::World*         rdf_world();
-	virtual SharedPtr<LV2URIMap> uris();
+	virtual Sord::World* rdf_world();
+	
+	virtual SharedPtr<URIs>      uris();
+	virtual SharedPtr<LV2URIMap> lv2_uri_map();
 
 	virtual int&    argc();
 	virtual char**& argv();