Update for latest LV2 Atom Object simplifications.

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

4 files changed, 17 insertions, 17 deletions

diff --git a/src/server/ControlBindings.cpp b/src/server/ControlBindings.cpp
index fce5ba28..3c6d26df 100644
--- a/src/server/ControlBindings.cpp
+++ b/src/server/ControlBindings.cpp
@@ -68,7 +68,7 @@ ControlBindings::binding_key(const Atom& binding) const
 	const Ingen::URIs& uris = _engine.world()->uris();
 	Key       key;
 	LV2_Atom* num = NULL;
-	if (binding.type() == uris.atom_Blank) {
+	if (binding.type() == uris.atom_Object) {
 		const LV2_Atom_Object_Body* obj = (const LV2_Atom_Object_Body*)
 			binding.get_body();
 		if (obj->otype == uris.midi_Bender) {
@@ -283,19 +283,19 @@ forge_binding(const URIs&           uris,
 	LV2_Atom_Forge_Frame frame;
 	switch (binding_type) {
 	case ControlBindings::Type::MIDI_CC:
-		lv2_atom_forge_blank(forge, &frame, 0, uris.midi_Controller);
-		lv2_atom_forge_property_head(forge, uris.midi_controllerNumber, 0);
+		lv2_atom_forge_object(forge, &frame, 0, uris.midi_Controller);
+		lv2_atom_forge_key(forge, uris.midi_controllerNumber);
 		lv2_atom_forge_int(forge, value);
 		break;
 	case ControlBindings::Type::MIDI_BENDER:
-		lv2_atom_forge_blank(forge, &frame, 0, uris.midi_Bender);
+		lv2_atom_forge_object(forge, &frame, 0, uris.midi_Bender);
 		break;
 	case ControlBindings::Type::MIDI_CHANNEL_PRESSURE:
-		lv2_atom_forge_blank(forge, &frame, 0, uris.midi_ChannelPressure);
+		lv2_atom_forge_object(forge, &frame, 0, uris.midi_ChannelPressure);
 		break;
 	case ControlBindings::Type::MIDI_NOTE:
-		lv2_atom_forge_blank(forge, &frame, 0, uris.midi_NoteOn);
-		lv2_atom_forge_property_head(forge, uris.midi_noteNumber, 0);
+		lv2_atom_forge_object(forge, &frame, 0, uris.midi_NoteOn);
+		lv2_atom_forge_key(forge, uris.midi_noteNumber);
 		lv2_atom_forge_int(forge, value);
 		break;
 	case ControlBindings::Type::MIDI_RPN: // TODO
diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp
index 32dd625f..8157bdbf 100644
--- a/src/server/JackDriver.cpp
+++ b/src/server/JackDriver.cpp
@@ -367,22 +367,22 @@ JackDriver::append_time_events(ProcessContext& context,
 	uint8_t              pos_buf[256];
 	LV2_Atom_Forge_Frame frame;
 	lv2_atom_forge_set_buffer(&_forge, pos_buf, sizeof(pos_buf));
-	lv2_atom_forge_blank(&_forge, &frame, 1, uris.time_Position);
-	lv2_atom_forge_property_head(&_forge, uris.time_frame, 0);
+	lv2_atom_forge_object(&_forge, &frame, 0, uris.time_Position);
+	lv2_atom_forge_key(&_forge, uris.time_frame);
 	lv2_atom_forge_long(&_forge, pos->frame);
-	lv2_atom_forge_property_head(&_forge, uris.time_speed, 0);
+	lv2_atom_forge_key(&_forge, uris.time_speed);
 	lv2_atom_forge_float(&_forge, rolling ? 1.0 : 0.0);
 	if (pos->valid & JackPositionBBT) {
-		lv2_atom_forge_property_head(&_forge, uris.time_barBeat, 0);
+		lv2_atom_forge_key(&_forge, uris.time_barBeat);
 		lv2_atom_forge_float(
 			&_forge, pos->beat - 1 + (pos->tick / pos->ticks_per_beat));
-		lv2_atom_forge_property_head(&_forge, uris.time_bar, 0);
+		lv2_atom_forge_key(&_forge, uris.time_bar);
 		lv2_atom_forge_long(&_forge, pos->bar - 1);
-		lv2_atom_forge_property_head(&_forge, uris.time_beatUnit, 0);
+		lv2_atom_forge_key(&_forge, uris.time_beatUnit);
 		lv2_atom_forge_int(&_forge, pos->beat_type);
-		lv2_atom_forge_property_head(&_forge, uris.time_beatsPerBar, 0);
+		lv2_atom_forge_key(&_forge, uris.time_beatsPerBar);
 		lv2_atom_forge_float(&_forge, pos->beats_per_bar);
-		lv2_atom_forge_property_head(&_forge, uris.time_beatsPerMinute, 0);
+		lv2_atom_forge_key(&_forge, uris.time_beatsPerMinute);
 		lv2_atom_forge_float(&_forge, pos->beats_per_minute);
 	}
 
diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp
index 91db7b21..072d0ba3 100644
--- a/src/server/events/Delta.cpp
+++ b/src/server/events/Delta.cpp
@@ -189,7 +189,7 @@ Delta::pre_process()
 					if (port->is_a(PortType::CONTROL) || port->is_a(PortType::CV)) {
 						if (value == uris.patch_wildcard) {
 							_engine.control_bindings()->learn(port);
-						} else if (value.type() == uris.atom_Blank) {
+						} else if (value.type() == uris.atom_Object) {
 							op = SpecialType::CONTROL_BINDING;
 						} else {
 							_status = Status::BAD_VALUE_TYPE;
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index 8bcef2da..9d64c07b 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -260,7 +260,7 @@ public:
 		const URIs&        uris = _engine.world()->uris();
 		LV2_Atom_Sequence* seq  = (LV2_Atom_Sequence*)_ports[0]->buffer();
 		LV2_ATOM_SEQUENCE_FOREACH(seq, ev) {
-			if (ev->body.type == uris.atom_Blank &&
+			if (ev->body.type == uris.atom_Object &&
 			    ((LV2_Atom_Object*)&ev)->body.otype == uris.time_Position) {
 				buffer.append_event(ev->time.frames,
 				                    ev->body.size,