LV2URIMap => URIMap.

Trim unnecessary includes.


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

27 files changed, 19 insertions, 39 deletions

diff --git a/src/server/Buffer.cpp b/src/server/Buffer.cpp
index b112d8ea..a89d19df 100644
--- a/src/server/Buffer.cpp
+++ b/src/server/Buffer.cpp
@@ -22,7 +22,7 @@
 #include <algorithm>
 
 #include "ingen/shared/LV2Features.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
+#include "ingen/shared/URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 #include "ingen/shared/World.hpp"
 #include "ingen_config.h"
@@ -118,7 +118,7 @@ Buffer::port_data(PortType port_type, SampleCount offset)
 		} else {
 			Raul::warn << "Audio data requested from non-audio buffer " << this << " :: "
 			           << _atom->type << " - "
-			           << _factory.engine().world()->lv2_uri_map()->unmap_uri(_atom->type)
+			           << _factory.engine().world()->uri_map()->unmap_uri(_atom->type)
 			           << std::endl;
 			assert(false);
 			return NULL;
diff --git a/src/server/BufferFactory.cpp b/src/server/BufferFactory.cpp
index fcbf1189..fce074da 100644
--- a/src/server/BufferFactory.cpp
+++ b/src/server/BufferFactory.cpp
@@ -16,7 +16,6 @@
 
 #include <algorithm>
 
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 #include "raul/log.hpp"
 
diff --git a/src/server/ConnectionImpl.cpp b/src/server/ConnectionImpl.cpp
index 1fde56b4..c91b7403 100644
--- a/src/server/ConnectionImpl.cpp
+++ b/src/server/ConnectionImpl.cpp
@@ -17,7 +17,6 @@
 #include <algorithm>
 #include <boost/intrusive_ptr.hpp>
 
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 #include "lv2/lv2plug.in/ns/ext/atom/util.h"
 #include "raul/Maid.hpp"
diff --git a/src/server/ControlBindings.cpp b/src/server/ControlBindings.cpp
index 0cfd5042..ac0d5018 100644
--- a/src/server/ControlBindings.cpp
+++ b/src/server/ControlBindings.cpp
@@ -16,7 +16,6 @@
 
 #include <math.h>
 
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 #include "ingen/shared/World.hpp"
 #include "lv2/lv2plug.in/ns/ext/atom/util.h"
diff --git a/src/server/ControlBindings.hpp b/src/server/ControlBindings.hpp
index 0a3a92c0..2a107dfc 100644
--- a/src/server/ControlBindings.hpp
+++ b/src/server/ControlBindings.hpp
@@ -20,7 +20,6 @@
 #include <map>
 #include <stdint.h>
 
-#include "ingen/shared/LV2URIMap.hpp"
 #include "raul/Atom.hpp"
 #include "raul/Path.hpp"
 #include "raul/SharedPtr.hpp"
diff --git a/src/server/DuplexPort.cpp b/src/server/DuplexPort.cpp
index 6050e669..e63de6e2 100644
--- a/src/server/DuplexPort.cpp
+++ b/src/server/DuplexPort.cpp
@@ -18,7 +18,6 @@
 #include <cassert>
 #include <string>
 
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 
 #include "Buffer.hpp"
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp
index f3b5e476..004a9806 100644
--- a/src/server/Engine.cpp
+++ b/src/server/Engine.cpp
@@ -17,16 +17,16 @@
 #include <cassert>
 #include <sys/mman.h>
 #include <unistd.h>
-#include "raul/log.hpp"
-#include "raul/Deletable.hpp"
-#include "raul/Maid.hpp"
-#include "raul/SharedPtr.hpp"
+
 #include "events/CreatePort.hpp"
-#include "ingen/shared/World.hpp"
 #include "ingen/shared/LV2Features.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/Store.hpp"
 #include "ingen/shared/URIs.hpp"
+#include "ingen/shared/World.hpp"
+#include "raul/Deletable.hpp"
+#include "raul/Maid.hpp"
+#include "raul/SharedPtr.hpp"
+#include "raul/log.hpp"
 
 #include "BufferFactory.hpp"
 #include "ClientBroadcaster.hpp"
diff --git a/src/server/InputPort.cpp b/src/server/InputPort.cpp
index a6b377c7..3f3dcdd0 100644
--- a/src/server/InputPort.cpp
+++ b/src/server/InputPort.cpp
@@ -29,7 +29,6 @@
 #include "OutputPort.hpp"
 #include "ProcessContext.hpp"
 #include "ThreadManager.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 #include "mix.hpp"
 #include "util.hpp"
diff --git a/src/server/InternalPlugin.cpp b/src/server/InternalPlugin.cpp
index bad76364..edfc75a2 100644
--- a/src/server/InternalPlugin.cpp
+++ b/src/server/InternalPlugin.cpp
@@ -16,7 +16,6 @@
 
 #include <cassert>
 #include <string>
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 #include "internals/Controller.hpp"
 #include "internals/Delay.hpp"
diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp
index 24e5f86c..370a4ce8 100644
--- a/src/server/JackDriver.cpp
+++ b/src/server/JackDriver.cpp
@@ -44,7 +44,6 @@
 #include "ProcessSlave.hpp"
 #include "ThreadManager.hpp"
 #include "ingen/shared/LV2Features.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/World.hpp"
 #include "util.hpp"
 
diff --git a/src/server/LV2Node.cpp b/src/server/LV2Node.cpp
index dfba7177..a3d8b104 100644
--- a/src/server/LV2Node.cpp
+++ b/src/server/LV2Node.cpp
@@ -27,7 +27,7 @@
 #include "raul/Maid.hpp"
 #include "raul/Array.hpp"
 
-#include "ingen/shared/LV2URIMap.hpp"
+#include "ingen/shared/URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 
 #include "AudioBuffer.hpp"
@@ -248,7 +248,7 @@ LV2Node::instantiate(BufferFactory& bufs)
 				if (lilv_node_is_uri(type)) {
 					port->add_property(uris.atom_bufferType,
 					                   forge.alloc_uri(lilv_node_as_uri(type)));
-					buffer_type = bufs.engine().world()->lv2_uri_map()->map_uri(
+					buffer_type = bufs.engine().world()->uri_map()->map_uri(
 						lilv_node_as_uri(type));
 				}
 			}
diff --git a/src/server/LV2Plugin.cpp b/src/server/LV2Plugin.cpp
index 42b9f2d4..0989f881 100644
--- a/src/server/LV2Plugin.cpp
+++ b/src/server/LV2Plugin.cpp
@@ -18,7 +18,6 @@
 #include <string>
 #include <glibmm.h>
 
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 #include "raul/log.hpp"
 #include "sord/sordmm.hpp"
diff --git a/src/server/Notification.cpp b/src/server/Notification.cpp
index 3d7efe23..05570a0f 100644
--- a/src/server/Notification.cpp
+++ b/src/server/Notification.cpp
@@ -14,7 +14,6 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 
 #include "ClientBroadcaster.hpp"
diff --git a/src/server/ObjectSender.cpp b/src/server/ObjectSender.cpp
index 85be4efd..9565bd82 100644
--- a/src/server/ObjectSender.cpp
+++ b/src/server/ObjectSender.cpp
@@ -16,7 +16,6 @@
 
 #include "ObjectSender.hpp"
 #include "ingen/Interface.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 #include "EngineStore.hpp"
 #include "PatchImpl.hpp"
diff --git a/src/server/OutputPort.cpp b/src/server/OutputPort.cpp
index b8ad0169..16984e3b 100644
--- a/src/server/OutputPort.cpp
+++ b/src/server/OutputPort.cpp
@@ -21,7 +21,6 @@
 #include "NodeImpl.hpp"
 #include "OutputPort.hpp"
 #include "ProcessContext.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 
 using namespace std;
diff --git a/src/server/PatchImpl.cpp b/src/server/PatchImpl.cpp
index 4fa13a40..912ce9c2 100644
--- a/src/server/PatchImpl.cpp
+++ b/src/server/PatchImpl.cpp
@@ -18,7 +18,6 @@
 #include <cmath>
 #include <string>
 
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 #include "ingen/shared/World.hpp"
 #include "raul/log.hpp"
diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp
index 051ecc8e..a775ab91 100644
--- a/src/server/PortImpl.cpp
+++ b/src/server/PortImpl.cpp
@@ -14,7 +14,6 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 #include "lv2/lv2plug.in/ns/ext/worker/worker.h"
 #include "raul/Array.hpp"
diff --git a/src/server/events/CreateNode.cpp b/src/server/events/CreateNode.cpp
index 5e070235..231cf2e2 100644
--- a/src/server/events/CreateNode.cpp
+++ b/src/server/events/CreateNode.cpp
@@ -14,7 +14,6 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 #include "raul/Maid.hpp"
 #include "raul/Path.hpp"
diff --git a/src/server/events/CreatePatch.cpp b/src/server/events/CreatePatch.cpp
index 794ff7d6..ed31130b 100644
--- a/src/server/events/CreatePatch.cpp
+++ b/src/server/events/CreatePatch.cpp
@@ -14,7 +14,6 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 #include "raul/Maid.hpp"
 #include "raul/Path.hpp"
diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp
index 386f1d59..d2377a36 100644
--- a/src/server/events/CreatePort.cpp
+++ b/src/server/events/CreatePort.cpp
@@ -14,12 +14,13 @@
   along with Ingen.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "ingen/shared/URIMap.hpp"
+#include "ingen/shared/URIs.hpp"
 #include "raul/Array.hpp"
 #include "raul/Atom.hpp"
 #include "raul/Maid.hpp"
 #include "raul/Path.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
-#include "ingen/shared/URIs.hpp"
+
 #include "ClientBroadcaster.hpp"
 #include "ControlBindings.hpp"
 #include "CreatePort.hpp"
@@ -79,7 +80,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()->lv2_uri_map()->map_uri(i->second.get_uri());
+			_buffer_type = _engine.world()->uri_map()->map_uri(i->second.get_uri());
 		}
 	}
 
diff --git a/src/server/events/SetMetadata.cpp b/src/server/events/SetMetadata.cpp
index 68cdbbbd..42392a8a 100644
--- a/src/server/events/SetMetadata.cpp
+++ b/src/server/events/SetMetadata.cpp
@@ -21,7 +21,7 @@
 #include "raul/log.hpp"
 #include "raul/Maid.hpp"
 
-#include "ingen/shared/LV2URIMap.hpp"
+#include "ingen/shared/URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 
 #include "ClientBroadcaster.hpp"
@@ -82,13 +82,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()->lv2_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()->lv2_uri_map()->unmap_uri(i->second.type()) << endl;
+		          << " :: " << engine.world()->uri_map()->unmap_uri(i->second.type()) << endl;
 	}
 	LOG(info) << "}" << endl;
 	*/
diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp
index ab4074e9..2c21fdbb 100644
--- a/src/server/events/SetPortValue.cpp
+++ b/src/server/events/SetPortValue.cpp
@@ -17,7 +17,6 @@
 #include <sstream>
 
 #include "ingen/shared/LV2Features.hpp"
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 #include "ingen/shared/World.hpp"
 #include "raul/log.hpp"
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index 5e21f679..df88f7d8 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -141,11 +141,11 @@ private:
 public:
 	LV2Driver(Engine& engine, SampleCount buffer_size, SampleCount sample_rate)
 		: _context(engine)
-		, _reader(*engine.world()->lv2_uri_map().get(),
+		, _reader(*engine.world()->uri_map().get(),
 		          *engine.world()->uris().get(),
 		          engine.world()->forge(),
 		          *engine.world()->engine().get())
-		, _writer(*engine.world()->lv2_uri_map().get(),
+		, _writer(*engine.world()->uri_map().get(),
 		          *engine.world()->uris().get(),
 		          *this)
 		, _to_ui(buffer_size * sizeof(float))  // FIXME: size
diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp
index 25561535..2b68966f 100644
--- a/src/server/internals/Controller.cpp
+++ b/src/server/internals/Controller.cpp
@@ -16,7 +16,6 @@
 
 #include <math.h>
 
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 #include "internals/Controller.hpp"
 #include "lv2/lv2plug.in/ns/ext/atom/util.h"
diff --git a/src/server/internals/Delay.cpp b/src/server/internals/Delay.cpp
index e2838d31..0386b2d2 100644
--- a/src/server/internals/Delay.cpp
+++ b/src/server/internals/Delay.cpp
@@ -17,7 +17,6 @@
 #include <cmath>
 #include <limits.h>
 
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 #include "raul/Array.hpp"
 #include "raul/Maid.hpp"
diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp
index 6eb6ffb2..3733a274 100644
--- a/src/server/internals/Note.cpp
+++ b/src/server/internals/Note.cpp
@@ -16,7 +16,6 @@
 
 #include <cmath>
 
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 #include "lv2/lv2plug.in/ns/ext/atom/util.h"
 #include "raul/Array.hpp"
diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp
index d6d13c58..3de1ffc6 100644
--- a/src/server/internals/Trigger.cpp
+++ b/src/server/internals/Trigger.cpp
@@ -16,7 +16,6 @@
 
 #include <cmath>
 
-#include "ingen/shared/LV2URIMap.hpp"
 #include "ingen/shared/URIs.hpp"
 #include "lv2/lv2plug.in/ns/ext/atom/util.h"
 #include "raul/log.hpp"