Better Parse plugin, working Print plugin.

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

9 files changed, 12 insertions, 12 deletions

diff --git a/src/engine/Buffer.cpp b/src/engine/Buffer.cpp
index 65e46736..07498b36 100644
--- a/src/engine/Buffer.cpp
+++ b/src/engine/Buffer.cpp
@@ -32,7 +32,7 @@ Buffer::create(DataType type, size_t size)
 		return new AudioBuffer(size);
 	else if (type.is_events())
 		return new EventBuffer(size);
-	else if (type.is_object())
+	else if (type.is_value())
 		return new ObjectBuffer(size);
 	else
 		throw;
diff --git a/src/engine/ConnectionImpl.cpp b/src/engine/ConnectionImpl.cpp
index f33c612b..6c7a63f0 100644
--- a/src/engine/ConnectionImpl.cpp
+++ b/src/engine/ConnectionImpl.cpp
@@ -79,7 +79,7 @@ ConnectionImpl::set_mode()
 	if (_mode == MIX && type() == DataType::EVENTS)
 		_mode = COPY;
 
-	if (type() == DataType::OBJECT)
+	if (type() == DataType::VALUE)
 		_mode = DIRECT;
 }
 
diff --git a/src/engine/LV2Info.cpp b/src/engine/LV2Info.cpp
index e94deaad..99c2ff85 100644
--- a/src/engine/LV2Info.cpp
+++ b/src/engine/LV2Info.cpp
@@ -37,7 +37,7 @@ LV2Info::LV2Info(Ingen::Shared::World* world)
 	, control_class(slv2_value_new_uri(world->slv2_world, SLV2_PORT_CLASS_CONTROL))
 	, audio_class(slv2_value_new_uri(world->slv2_world, SLV2_PORT_CLASS_AUDIO))
 	, event_class(slv2_value_new_uri(world->slv2_world, SLV2_PORT_CLASS_EVENT))
-	, object_port_class(slv2_value_new_uri(world->slv2_world, LV2_OBJECT_URI "#ObjectPort"))
+	, value_port_class(slv2_value_new_uri(world->slv2_world, LV2_OBJECT_URI "#ValuePort"))
 	, _world(world)
 {
 	assert(world);
@@ -57,7 +57,7 @@ LV2Info::~LV2Info()
 	slv2_value_free(control_class);
 	slv2_value_free(audio_class);
 	slv2_value_free(event_class);
-	slv2_value_free(object_port_class);
+	slv2_value_free(value_port_class);
 }
 
 } // namespace Ingen
diff --git a/src/engine/LV2Info.hpp b/src/engine/LV2Info.hpp
index 8d4478aa..76dfefa7 100644
--- a/src/engine/LV2Info.hpp
+++ b/src/engine/LV2Info.hpp
@@ -50,7 +50,7 @@ public:
 	SLV2Value control_class;
 	SLV2Value audio_class;
 	SLV2Value event_class;
-	SLV2Value object_port_class;
+	SLV2Value value_port_class;
 
 	Ingen::Shared::World& world()     { return *_world; }
 	SLV2World             lv2_world() { return _world->slv2_world; }
diff --git a/src/engine/LV2Node.cpp b/src/engine/LV2Node.cpp
index c12171e9..1515344a 100644
--- a/src/engine/LV2Node.cpp
+++ b/src/engine/LV2Node.cpp
@@ -217,8 +217,8 @@ LV2Node::instantiate()
 		} else if (slv2_port_is_a(plug, id, info->event_class)) {
 			data_type = DataType::EVENTS;
 			port_buffer_size = _buffer_size;
-		} else if (slv2_port_is_a(plug, id, info->object_port_class)) {
-			data_type = DataType::OBJECT;
+		} else if (slv2_port_is_a(plug, id, info->value_port_class)) {
+			data_type = DataType::VALUE;
 			port_buffer_size = 0;
 
 			// Get default value, and its length
diff --git a/src/engine/MessageContext.cpp b/src/engine/MessageContext.cpp
index c0f4d3a6..ba03088d 100644
--- a/src/engine/MessageContext.cpp
+++ b/src/engine/MessageContext.cpp
@@ -37,7 +37,7 @@ MessageContext::run(NodeImpl* node)
 	void*      valid_ports = node->valid_ports();
 	PatchImpl* patch       = node->parent_patch();
 
-	cout << "MESSAGE RUN " << node->path() << " {" << endl;
+	//cout << "MESSAGE RUN " << node->path() << " {" << endl;
 	for (uint32_t i = 0; i < node->num_ports(); ++i) {
 		PortImpl* p = node->port_impl(i);
 		if (p->is_output() && p->context() == Context::MESSAGE &&
@@ -52,7 +52,7 @@ MessageContext::run(NodeImpl* node)
 			}
 		}
 	}
-	cout << "}" << endl;
+	//cout << "}" << endl;
 
 	node->reset_valid_ports();
 }
diff --git a/src/engine/ObjectBuffer.cpp b/src/engine/ObjectBuffer.cpp
index 0f40ea9a..a26eaea5 100644
--- a/src/engine/ObjectBuffer.cpp
+++ b/src/engine/ObjectBuffer.cpp
@@ -38,7 +38,7 @@ using namespace Shared;
  * \a capacity is in bytes.
  */
 ObjectBuffer::ObjectBuffer(size_t capacity)
-	: Buffer(DataType(DataType::OBJECT), capacity)
+	: Buffer(DataType(DataType::VALUE), capacity)
 {
 	capacity = std::max(capacity, (size_t)32);
 	cerr << "Creating Object Buffer " << _buf << " capacity = " << capacity << endl;
diff --git a/src/engine/PortImpl.cpp b/src/engine/PortImpl.cpp
index 20d0b682..ecb0d20b 100644
--- a/src/engine/PortImpl.cpp
+++ b/src/engine/PortImpl.cpp
@@ -194,7 +194,7 @@ PortImpl::broadcast_value(Context& context, bool force)
 			context.event_sink().write(sizeof(ev), &ev);
 		}
 		break;
-	case DataType::OBJECT:
+	case DataType::VALUE:
 		LV2Object::to_atom(context.engine().world(), ((ObjectBuffer*)buffer(0))->data(), val);
 		break;
 	}
diff --git a/src/engine/events/RequestMetadata.cpp b/src/engine/events/RequestMetadata.cpp
index 06069f74..e6ba7f5d 100644
--- a/src/engine/events/RequestMetadata.cpp
+++ b/src/engine/events/RequestMetadata.cpp
@@ -96,7 +96,7 @@ RequestMetadata::execute(ProcessContext& context)
 		if (port) {
 			if (port->type() == DataType::CONTROL || port->type() == DataType::AUDIO)
 				_value = ((AudioBuffer*)port->buffer(0))->value_at(0); // TODO: offset
-			else if (port->type() == DataType::OBJECT)
+			else if (port->type() == DataType::VALUE)
 				LV2Object::to_atom(context.engine().world(),
 						((ObjectBuffer*)port->buffer(0))->data(), _value);
 		} else {