Consistent naming for URI quarks.

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

5 files changed, 14 insertions, 14 deletions

diff --git a/src/engine/BufferFactory.cpp b/src/engine/BufferFactory.cpp
index 75803649..0d2fc76e 100644
--- a/src/engine/BufferFactory.cpp
+++ b/src/engine/BufferFactory.cpp
@@ -133,12 +133,12 @@ BufferFactory::create(Shared::PortType type, size_t size)
 
 	if (type.is_control()) {
 		AudioBuffer* ret = new AudioBuffer(*this, type, size);
-		ret->atom()->type = _uris->object_class_vector.id;
-		((LV2_Atom_Vector*)ret->atom()->body)->elem_type = _uris->object_class_float32.id;
+		ret->atom()->type = _uris->atom_Vector.id;
+		((LV2_Atom_Vector*)ret->atom()->body)->elem_type = _uris->atom_Float32.id;
 		buffer = ret;
 	} else if (type.is_audio()) {
 		AudioBuffer* ret = new AudioBuffer(*this, type, size);
-		ret->atom()->type = _uris->object_class_float32.id;
+		ret->atom()->type = _uris->atom_Float32.id;
 		buffer = ret;
 	} else if (type.is_events()) {
 		buffer = new EventBuffer(*this, size);
diff --git a/src/engine/ConnectionImpl.cpp b/src/engine/ConnectionImpl.cpp
index 43f9136a..40530694 100644
--- a/src/engine/ConnectionImpl.cpp
+++ b/src/engine/ConnectionImpl.cpp
@@ -142,16 +142,16 @@ ConnectionImpl::can_connect(const OutputPort* src, const InputPort* dst)
 			  && (dst->is_a(PortType::MESSAGE) || dst->is_a(PortType::VALUE)))
 
 			// Control => atom:Float32 Value
-			|| (src->is_a(PortType::CONTROL) && dst->supports(uris.object_class_float32))
+			|| (src->is_a(PortType::CONTROL) && dst->supports(uris.atom_Float32))
 
 			// Audio => atom:Vector Value			
-			|| (src->is_a(PortType::AUDIO)   && dst->supports(uris.object_class_vector))
+			|| (src->is_a(PortType::AUDIO)   && dst->supports(uris.atom_Vector))
 
 			// atom:Float32 Value => Control
-			|| (src->supports(uris.object_class_float32) && dst->is_a(PortType::CONTROL))
+			|| (src->supports(uris.atom_Float32) && dst->is_a(PortType::CONTROL))
 
 			// atom:Vector Value => Audio
-			|| (src->supports(uris.object_class_vector)  && dst->is_a(PortType::AUDIO)));
+			|| (src->supports(uris.atom_Vector)  && dst->is_a(PortType::AUDIO)));
 }
 
 
diff --git a/src/engine/ControlBindings.cpp b/src/engine/ControlBindings.cpp
index bc8dccba..12fcc9b1 100644
--- a/src/engine/ControlBindings.cpp
+++ b/src/engine/ControlBindings.cpp
@@ -152,7 +152,7 @@ ControlBindings::port_value_changed(ProcessContext& context, PortImpl* port)
 			break;
 		}
 		if (size > 0)
-			_feedback->append(0, 0, uris.midi_event.id, size, buf);
+			_feedback->append(0, 0, uris.midi_MidiEvent.id, size, buf);
 	}
 }
 
@@ -345,7 +345,7 @@ ControlBindings::pre_process(ProcessContext& context, EventBuffer* buffer)
 		for (buffer->rewind();
 				buffer->get_event(&frames, &subframes, &type, &size, &buf);
 				buffer->increment()) {
-			if (type != uris.midi_event.id)
+			if (type != uris.midi_MidiEvent.id)
 				continue;
 
 			const Key key = midi_event_key(size, buf, value);
@@ -362,7 +362,7 @@ ControlBindings::pre_process(ProcessContext& context, EventBuffer* buffer)
 	for (buffer->rewind();
 			buffer->get_event(&frames, &subframes, &type, &size, &buf);
 			buffer->increment()) {
-		if (type != uris.midi_event.id)
+		if (type != uris.midi_MidiEvent.id)
 			continue;
 
 		const Key key = midi_event_key(size, buf, value);
diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp
index a1d81a10..bedd6438 100644
--- a/src/engine/Engine.cpp
+++ b/src/engine/Engine.cpp
@@ -192,7 +192,7 @@ Engine::activate()
 
 		Shared::Resource::Properties control_properties;
 		control_properties.insert(make_pair(uris.lv2_name, "Control"));
-		control_properties.insert(make_pair(uris.rdf_type, uris.lv2ev_EventPort));
+		control_properties.insert(make_pair(uris.rdf_type, uris.ev_EventPort));
 
 		// Add control input
 		Shared::Resource::Properties in_properties(control_properties);
@@ -203,7 +203,7 @@ Engine::activate()
 
 		execute_and_delete_event(context, new Events::CreatePort(
 				*this, SharedPtr<Request>(), 0,
-				"/control_in", uris.lv2ev_EventPort, false, in_properties));
+				"/control_in", uris.ev_EventPort, false, in_properties));
 
 		// Add control out
 		Shared::Resource::Properties out_properties(control_properties);
@@ -214,7 +214,7 @@ Engine::activate()
 
 		execute_and_delete_event(context, new Events::CreatePort(
 				*this, SharedPtr<Request>(), 0,
-				"/control_out", uris.lv2ev_EventPort, true, out_properties));
+				"/control_out", uris.ev_EventPort, true, out_properties));
 	}
 
 	_driver->activate();
diff --git a/src/engine/events/SetPortValue.cpp b/src/engine/events/SetPortValue.cpp
index c793845e..a4b1554b 100644
--- a/src/engine/events/SetPortValue.cpp
+++ b/src/engine/events/SetPortValue.cpp
@@ -166,7 +166,7 @@ SetPortValue::apply(Context& context)
 
 			} else if (!strcmp(_value.get_blob_type(), "http://lv2plug.in/ns/ext/midi#MidiEvent")) {
 				ebuf->prepare_write(context);
-				ebuf->append(frames, 0, uris.midi_event.id, _value.data_size(),
+				ebuf->append(frames, 0, uris.midi_MidiEvent.id, _value.data_size(),
 						(const uint8_t*)_value.get_blob());
 				_port->raise_set_by_user_flag();
 				return;