From ee1ba36e564c4f0545e50ec91fa4b14d6dfca91b Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 21 Oct 2011 19:29:03 +0000 Subject: Separate URIs from LV2URIMap. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3564 a436a847-0d15-0410-975c-d299462d15a1 --- src/server/events/CreatePatch.cpp | 2 +- src/server/events/CreatePort.cpp | 4 ++-- src/server/events/RegisterClient.cpp | 2 +- src/server/events/SetMetadata.cpp | 4 ++-- src/server/events/SetPortValue.cpp | 7 ++++--- 5 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src/server/events') diff --git a/src/server/events/CreatePatch.cpp b/src/server/events/CreatePatch.cpp index a5c75adf..290ee626 100644 --- a/src/server/events/CreatePatch.cpp +++ b/src/server/events/CreatePatch.cpp @@ -80,7 +80,7 @@ CreatePatch::pre_process() if (_parent != NULL && _poly > 1 && _poly == static_cast(_parent->internal_poly())) poly = _poly; - const Ingen::Shared::LV2URIMap& uris = *_engine.world()->uris().get(); + const Ingen::Shared::URIs& uris = *_engine.world()->uris().get(); _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 84a8e2d3..28e337e3 100644 --- a/src/server/events/CreatePort.cpp +++ b/src/server/events/CreatePort.cpp @@ -57,7 +57,7 @@ CreatePort::CreatePort( , _properties(properties) , _is_output(is_output) { - const Ingen::Shared::LV2URIMap& uris = *_engine.world()->uris().get(); + const Ingen::Shared::URIs& uris = *_engine.world()->uris().get(); typedef Resource::Properties::const_iterator Iterator; typedef std::pair Range; @@ -97,7 +97,7 @@ CreatePort::pre_process() _patch = _engine.engine_store()->find_patch(_path.parent()); - const Ingen::Shared::LV2URIMap& uris = *_engine.world()->uris().get(); + const Ingen::Shared::URIs& uris = *_engine.world()->uris().get(); if (_patch != NULL) { assert(_patch->path() == _path.parent()); diff --git a/src/server/events/RegisterClient.cpp b/src/server/events/RegisterClient.cpp index 32c1a0c9..7b22bd17 100644 --- a/src/server/events/RegisterClient.cpp +++ b/src/server/events/RegisterClient.cpp @@ -57,7 +57,7 @@ RegisterClient::post_process() kludge. TODO: keep a proper RDF model to describe the engine and send that to clients. */ - const Ingen::Shared::LV2URIMap& uris = *_engine.world()->uris().get(); + const Ingen::Shared::URIs& uris = *_engine.world()->uris().get(); _client->set_property(uris.ingen_engine, uris.ingen_sampleRate, int32_t(_engine.driver()->sample_rate())); diff --git a/src/server/events/SetMetadata.cpp b/src/server/events/SetMetadata.cpp index 4e40baeb..806d47ef 100644 --- a/src/server/events/SetMetadata.cpp +++ b/src/server/events/SetMetadata.cpp @@ -118,7 +118,7 @@ SetMetadata::pre_process() return; } - const Ingen::Shared::LV2URIMap& uris = *_engine.world()->uris().get(); + const Ingen::Shared::URIs& uris = *_engine.world()->uris().get(); if (is_graph_object && !_object) { Path path(_subject.str()); @@ -274,7 +274,7 @@ SetMetadata::execute(ProcessContext& context) return; } - const Ingen::Shared::LV2URIMap& uris = *_engine.world()->uris().get(); + const Ingen::Shared::URIs& uris = *_engine.world()->uris().get(); if (_create_event) { _create_event->execute(context); diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp index 7c3adb7e..a783e4e9 100644 --- a/src/server/events/SetPortValue.cpp +++ b/src/server/events/SetPortValue.cpp @@ -147,7 +147,8 @@ SetPortValue::apply(Context& context) return; } - Ingen::Shared::LV2URIMap& uris = *_engine.world()->uris().get(); + Ingen::Shared::URIs& uris = *_engine.world()->uris().get(); + Ingen::Shared::LV2URIMap& uri_map = *_engine.world()->lv2_uri_map().get(); EventBuffer* const ebuf = dynamic_cast(buf); if (ebuf && _value.type() == Atom::BLOB) { @@ -155,7 +156,7 @@ SetPortValue::apply(Context& context) // Size 0 event, pass it along to the plugin as a typed but empty event if (_value.data_size() == 0) { - const uint32_t type_id = uris.uri_to_id(NULL, _value.get_blob_type()); + const uint32_t type_id = uri_map.uri_to_id(NULL, _value.get_blob_type()); ebuf->append(frames, 0, type_id, 0, NULL); _port->raise_set_by_user_flag(); return; @@ -164,7 +165,7 @@ SetPortValue::apply(Context& context) "http://lv2plug.in/ns/ext/midi#MidiEvent")) { ebuf->prepare_write(context); ebuf->append(frames, 0, - uris.global_to_event(uris.midi_MidiEvent.id).second, + uri_map.global_to_event(uris.midi_MidiEvent.id).second, _value.data_size(), (const uint8_t*)_value.get_blob()); _port->raise_set_by_user_flag(); -- cgit v1.2.1