Remove special request_port_value, just use request_variable with predicate ingen:value.

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

4 files changed, 39 insertions, 136 deletions

diff --git a/src/engine/events/RequestMetadataEvent.cpp b/src/engine/events/RequestMetadataEvent.cpp
index 685108f4..cf8a127a 100644
--- a/src/engine/events/RequestMetadataEvent.cpp
+++ b/src/engine/events/RequestMetadataEvent.cpp
@@ -22,12 +22,16 @@
 #include "GraphObjectImpl.hpp"
 #include "EngineStore.hpp"
 #include "ClientBroadcaster.hpp"
+#include "PortImpl.hpp"
+#include "AudioBuffer.hpp"
 
 using namespace std;
 using namespace Raul;
 
 namespace Ingen {
 
+using namespace Shared;
+
 
 RequestMetadataEvent::RequestMetadataEvent(Engine&              engine,
 	                                       SharedPtr<Responder> responder,
@@ -36,6 +40,7 @@ RequestMetadataEvent::RequestMetadataEvent(Engine&              engine,
 	                                       const Path&          node_path,
 	                                       const URI&           key)
 	: QueuedEvent(engine, responder, timestamp)
+	, _special_type(NONE)
 	, _path(node_path)
 	, _property(property)
 	, _key(key)
@@ -55,7 +60,9 @@ RequestMetadataEvent::pre_process()
 		}
 	}
 
-	if (_property)
+	if (_key.str() == "ingen:value")
+		_special_type = PORT_VALUE;
+	else if (_property)
 		_value = _object->get_property(_key);
 	else
 		_value = _object->get_variable(_key);
@@ -65,10 +72,34 @@ RequestMetadataEvent::pre_process()
 
 
 void
+RequestMetadataEvent::execute(ProcessContext& context)
+{
+	QueuedEvent::execute(context);
+	if (_special_type == PORT_VALUE) {
+		PortImpl* port = dynamic_cast<PortImpl*>(_object);
+		if (port) {
+			if (port->type() == DataType::CONTROL || port->type() == DataType::AUDIO)
+				_value = ((AudioBuffer*)port->buffer(0))->value_at(0); // TODO: offset
+		} else {
+			_object = 0;
+		}
+	}
+}
+
+
+void
 RequestMetadataEvent::post_process()
 {
 	if (_responder->client()) {
-		if (!_object) {
+		if (_special_type == PORT_VALUE) {
+			if (_object) {
+				_responder->respond_ok();
+				_responder->client()->set_port_value(_path, _value);
+			} else {
+				const string msg = "Get value for non-port " + _path.str();
+				_responder->respond_error(msg);
+			}
+		} else if (!_object) {
 			const string msg = "Unable to find variable subject " + _path.str();
 			_responder->respond_error(msg);
 		} else {
diff --git a/src/engine/events/RequestMetadataEvent.hpp b/src/engine/events/RequestMetadataEvent.hpp
index d3480b7c..5b163500 100644
--- a/src/engine/events/RequestMetadataEvent.hpp
+++ b/src/engine/events/RequestMetadataEvent.hpp
@@ -42,9 +42,15 @@ public:
 	                     const Raul::URI&     key);
 
 	void pre_process();
+	void execute(ProcessContext& context);
 	void post_process();
 
 private:
+	enum {
+		NONE,
+		PORT_VALUE
+	} _special_type;
+	
 	Raul::Path       _path;
 	bool             _property;
 	Raul::URI        _key;
diff --git a/src/engine/events/RequestPortValueEvent.cpp b/src/engine/events/RequestPortValueEvent.cpp
deleted file mode 100644
index 5f3a33a7..00000000
--- a/src/engine/events/RequestPortValueEvent.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/* This file is part of Ingen.
- * Copyright (C) 2007 Dave Robillard <http://drobilla.net>
- * 
- * Ingen is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- * 
- * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "RequestPortValueEvent.hpp"
-#include "interface/ClientInterface.hpp"
-#include "Responder.hpp"
-#include "Engine.hpp"
-#include "PortImpl.hpp"
-#include "EngineStore.hpp"
-#include "ClientBroadcaster.hpp"
-#include "AudioBuffer.hpp"
-#include "ProcessContext.hpp"
-
-using namespace std;
-using namespace Raul;
-
-namespace Ingen {
-
-using namespace Shared;
-
-
-RequestPortValueEvent::RequestPortValueEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, const Path& port_path)
-	: QueuedEvent(engine, responder, timestamp)
-	, _port_path(port_path)
-	, _port(NULL)
-	, _value(0.0)
-{
-}
-
-
-void
-RequestPortValueEvent::pre_process()
-{
-	_port = _engine.engine_store()->find_port(_port_path);
-
-	QueuedEvent::pre_process();
-}
-
-
-void
-RequestPortValueEvent::execute(ProcessContext& context)
-{
-	QueuedEvent::execute(context);
-	assert(_time >= context.start() && _time <= context.end());
-
-	if (_port != NULL && (_port->type() == DataType::CONTROL || _port->type() == DataType::AUDIO))
-		_value = ((AudioBuffer*)_port->buffer(0))->value_at(0/*_time - start*/);
-	else 
-		_port = NULL; // triggers error response
-}
-
-
-void
-RequestPortValueEvent::post_process()
-{
-	string msg;
-	if (!_port) {
-		_responder->respond_error("Unable to find port for get_value responder.");
-	} else if (_responder->client()) {
-		_responder->respond_ok();
-		_responder->client()->set_port_value(_port_path, _value);
-	} else {
-		_responder->respond_error("Unable to find client to send port value");
-	}
-}
-
-
-} // namespace Ingen
-
diff --git a/src/engine/events/RequestPortValueEvent.hpp b/src/engine/events/RequestPortValueEvent.hpp
deleted file mode 100644
index 79ca4bfe..00000000
--- a/src/engine/events/RequestPortValueEvent.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/* This file is part of Ingen.
- * Copyright (C) 2007 Dave Robillard <http://drobilla.net>
- * 
- * Ingen is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any later
- * version.
- * 
- * Ingen is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef REQUESTPORTVALUEEVENT_H
-#define REQUESTPORTVALUEEVENT_H
-
-#include "QueuedEvent.hpp"
-#include "types.hpp"
-
-namespace Ingen {
-	
-class PortImpl;
-
-
-/** A request from a client to send the value of a port.
- *
- * \ingroup engine
- */
-class RequestPortValueEvent : public QueuedEvent
-{
-public:
-	RequestPortValueEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, const Raul::Path& port_path);
-
-	void pre_process();
-	void execute(ProcessContext& context);
-	void post_process();
-
-private:
-	const Raul::Path _port_path;
-	PortImpl*        _port;
-	Sample           _value;
-};
-
-
-} // namespace Ingen
-
-#endif // REQUESTPORTVALUEEVENT_H