Clean up and better document World interface.

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

6 files changed, 13 insertions, 13 deletions

diff --git a/src/server/events/CreateNode.cpp b/src/server/events/CreateNode.cpp
index 9a9df50e..2b9c6766 100644
--- a/src/server/events/CreateNode.cpp
+++ b/src/server/events/CreateNode.cpp
@@ -55,7 +55,7 @@ CreateNode::CreateNode(Engine&                     engine,
 	, _properties(properties)
 {
 	const Resource::Properties::const_iterator p = properties.find(
-			engine.world()->uris()->ingen_polyphonic);
+			engine.world()->uris().ingen_polyphonic);
 	if (p != properties.end() && p->second.type() == engine.world()->forge().Bool
 			&& p->second.get_bool())
 		_polyphonic = true;
diff --git a/src/server/events/CreatePatch.cpp b/src/server/events/CreatePatch.cpp
index d23c4506..22c4a817 100644
--- a/src/server/events/CreatePatch.cpp
+++ b/src/server/events/CreatePatch.cpp
@@ -76,7 +76,7 @@ CreatePatch::pre_process()
 	if (_parent != NULL && _poly > 1 && _poly == static_cast<int>(_parent->internal_poly()))
 		poly = _poly;
 
-	const Ingen::Shared::URIs& uris = *_engine.world()->uris().get();
+	const Ingen::Shared::URIs& uris = _engine.world()->uris();
 
 	_patch = new PatchImpl(_engine, path.symbol(), poly, _parent,
 			_engine.driver()->sample_rate(), _poly);
diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp
index 448f7768..872b79c4 100644
--- a/src/server/events/CreatePort.cpp
+++ b/src/server/events/CreatePort.cpp
@@ -55,7 +55,7 @@ CreatePort::CreatePort(Engine&                     engine,
 	, _properties(properties)
 	, _is_output(is_output)
 {
-	const Ingen::Shared::URIs& uris = *_engine.world()->uris().get();
+	const Ingen::Shared::URIs& uris = _engine.world()->uris();
 
 	typedef Resource::Properties::const_iterator Iterator;
 	typedef std::pair<Iterator, Iterator>        Range;
@@ -77,7 +77,7 @@ CreatePort::CreatePort(Engine&                     engine,
 	const Range buffer_types = properties.equal_range(uris.atom_bufferType);
 	for (Iterator i = buffer_types.first; i != buffer_types.second; ++i) {
 		if (i->second.type() == _engine.world()->forge().URI) {
-			_buffer_type = _engine.world()->uri_map()->map_uri(i->second.get_uri());
+			_buffer_type = _engine.world()->uri_map().map_uri(i->second.get_uri());
 		}
 	}
 
@@ -96,7 +96,7 @@ CreatePort::pre_process()
 
 	_patch = _engine.engine_store()->find_patch(_path.parent());
 
-	const Ingen::Shared::URIs& uris = *_engine.world()->uris().get();
+	const Ingen::Shared::URIs& uris = _engine.world()->uris();
 
 	if (_patch != NULL) {
 		assert(_patch->path() == _path.parent());
diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp
index 0f1a16d7..503726a3 100644
--- a/src/server/events/Get.cpp
+++ b/src/server/events/Get.cpp
@@ -69,7 +69,7 @@ Get::post_process()
 		respond(SUCCESS);
 		// TODO: Keep a proper RDF model of the engine
 		if (_request_client) {
-			Shared::URIs& uris = *_engine.world()->uris().get();
+			Shared::URIs& uris = _engine.world()->uris();
 			_request_client->set_property(
 				uris.ingen_engine,
 				uris.ingen_sampleRate,
diff --git a/src/server/events/SetMetadata.cpp b/src/server/events/SetMetadata.cpp
index 38e7490c..5d447895 100644
--- a/src/server/events/SetMetadata.cpp
+++ b/src/server/events/SetMetadata.cpp
@@ -79,13 +79,13 @@ SetMetadata::SetMetadata(Engine&           engine,
 	for (iterator i = properties.begin(); i != properties.end(); ++i) {
 		LOG(info) << "    + " << i->first
 		          << " = " << engine.world()->forge().str(i->second)
-		          << " :: " << engine.world()->uri_map()->unmap_uri(i->second.type()) << endl;
+		          << " :: " << engine.world()->uri_map().unmap_uri(i->second.type()) << endl;
 	}
 	typedef Resource::Properties::const_iterator iterator;
 	for (iterator i = remove.begin(); i != remove.end(); ++i) {
 		LOG(info) << "    - " << i->first
 		          << " = " << engine.world()->forge().str(i->second)
-		          << " :: " << engine.world()->uri_map()->unmap_uri(i->second.type()) << endl;
+		          << " :: " << engine.world()->uri_map().unmap_uri(i->second.type()) << endl;
 	}
 	LOG(info) << "}" << endl;
 	*/
@@ -118,7 +118,7 @@ SetMetadata::pre_process()
 		return;
 	}
 
-	const Ingen::Shared::URIs& uris = *_engine.world()->uris().get();
+	const Ingen::Shared::URIs& uris = _engine.world()->uris();
 
 	if (is_graph_object && !_object) {
 		Raul::Path path(_subject.str());
@@ -272,7 +272,7 @@ SetMetadata::execute(ProcessContext& context)
 		return;
 	}
 
-	const Ingen::Shared::URIs& uris = *_engine.world()->uris().get();
+	const Ingen::Shared::URIs& uris = _engine.world()->uris();
 
 	if (_create_event) {
 		_create_event->execute(context);
diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp
index 6305ff1e..db3a72e4 100644
--- a/src/server/events/SetPortValue.cpp
+++ b/src/server/events/SetPortValue.cpp
@@ -91,7 +91,7 @@ SetPortValue::pre_process()
 
 	if (_port) {
 		_port->set_value(_value);
-		_port->set_property(_engine.world()->uris()->ingen_value, _value);
+		_port->set_property(_engine.world()->uris().ingen_value, _value);
 	}
 
 	_binding = _engine.control_bindings()->port_binding(_port);
@@ -119,7 +119,7 @@ SetPortValue::apply(Context& context)
 	if (_status == SUCCESS && !_port)
 		_port = _engine.engine_store()->find_port(_port_path);
 
-	Ingen::Shared::URIs& uris = *_engine.world()->uris().get();
+	Ingen::Shared::URIs& uris = _engine.world()->uris();
 
 	if (!_port) {
 		if (_status == SUCCESS)
@@ -153,7 +153,7 @@ SetPortValue::post_process()
 	if (!_status) {
 		_engine.broadcaster()->set_property(
 			_port_path,
-			_engine.world()->uris()->ingen_value,
+			_engine.world()->uris().ingen_value,
 			_value);
 	}
 }