From 59492c673f5de893e8b91ca50a945a697ddfa404 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 18 Jan 2014 06:21:31 +0000 Subject: Consolidate URIs. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5316 a436a847-0d15-0410-975c-d299462d15a1 --- src/server/events/Delta.cpp | 10 +++++----- src/server/events/Get.cpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/server/events') diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp index d551335f..91db7b21 100644 --- a/src/server/events/Delta.cpp +++ b/src/server/events/Delta.cpp @@ -151,7 +151,7 @@ Delta::pre_process() for (const auto& r : _remove) { const Raul::URI& key = r.first; const Atom& value = r.second; - if (key == uris.ingen_controlBinding && value == uris.wildcard) { + if (key == uris.midi_binding && value == uris.patch_wildcard) { PortImpl* port = dynamic_cast(_object); if (port) _old_bindings = _engine.control_bindings()->remove(port); @@ -167,7 +167,7 @@ Delta::pre_process() SpecialType op = SpecialType::NONE; if (obj) { Resource& resource = *obj; - if (value != uris.wildcard) { + if (value != uris.patch_wildcard) { resource.add_property(key, value, value.context()); } @@ -185,9 +185,9 @@ Delta::pre_process() _engine, _request_client, _request_id, _time, port, value); ev->pre_process(); _set_events.push_back(ev); - } else if (key == uris.ingen_controlBinding) { + } else if (key == uris.midi_binding) { if (port->is_a(PortType::CONTROL) || port->is_a(PortType::CV)) { - if (value == uris.wildcard) { + if (value == uris.patch_wildcard) { _engine.control_bindings()->learn(port); } else if (value.type() == uris.atom_Blank) { op = SpecialType::CONTROL_BINDING; @@ -199,7 +199,7 @@ Delta::pre_process() } } } else if ((block = dynamic_cast(_object))) { - if (key == uris.ingen_controlBinding && value == uris.wildcard) { + if (key == uris.midi_binding && value == uris.patch_wildcard) { op = SpecialType::CONTROL_BINDING; // Internal block learn } } diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp index 9a5dd1fa..b46f12a7 100644 --- a/src/server/events/Get.cpp +++ b/src/server/events/Get.cpp @@ -137,8 +137,8 @@ Get::post_process() // TODO: Keep a proper RDF model of the engine URIs& uris = _engine.world()->uris(); _request_client->set_property( - uris.ingen_engine, - uris.ingen_sampleRate, + Raul::URI("ingen:/engine"), + uris.param_sampleRate, uris.forge.make(int32_t(_engine.driver()->sample_rate()))); } else if (_object) { const BlockImpl* block = NULL; -- cgit v1.2.1