summaryrefslogtreecommitdiffstats
path: root/src/server/events
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-05-10 04:02:24 +0000
committerDavid Robillard <d@drobilla.net>2012-05-10 04:02:24 +0000
commit8ec295a0f2a40086ed83e8d2ad8ad38c8125bcb4 (patch)
treeaf044468e3f20bea5c18d02ba35cd3a69cdc4808 /src/server/events
parentda468f24388d7f0f574c6e4dd4022e05d47a9db2 (diff)
downloadingen-8ec295a0f2a40086ed83e8d2ad8ad38c8125bcb4.tar.gz
ingen-8ec295a0f2a40086ed83e8d2ad8ad38c8125bcb4.tar.bz2
ingen-8ec295a0f2a40086ed83e8d2ad8ad38c8125bcb4.zip
LV2URIMap => URIMap.
Trim unnecessary includes. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4337 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/events')
-rw-r--r--src/server/events/CreateNode.cpp1
-rw-r--r--src/server/events/CreatePatch.cpp1
-rw-r--r--src/server/events/CreatePort.cpp7
-rw-r--r--src/server/events/SetMetadata.cpp6
-rw-r--r--src/server/events/SetPortValue.cpp1
5 files changed, 7 insertions, 9 deletions
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"