From f62ef545425476959b1335f3a303d6d5f80ca0e5 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 13 May 2009 05:31:05 +0000 Subject: 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 --- src/client/HTTPEngineSender.cpp | 6 --- src/client/HTTPEngineSender.hpp | 1 - src/client/OSCEngineSender.cpp | 10 ---- src/client/OSCEngineSender.hpp | 1 - src/common/interface/EngineInterface.hpp | 2 - src/engine/OSCEngineReceiver.cpp | 17 ------ src/engine/OSCEngineReceiver.hpp | 1 - src/engine/QueuedEngineInterface.cpp | 7 --- src/engine/QueuedEngineInterface.hpp | 1 - src/engine/events.hpp | 1 - src/engine/events/RequestMetadataEvent.cpp | 35 +++++++++++- src/engine/events/RequestMetadataEvent.hpp | 6 +++ src/engine/events/RequestPortValueEvent.cpp | 83 ----------------------------- src/engine/events/RequestPortValueEvent.hpp | 51 ------------------ src/engine/wscript | 1 - src/gui/NodeControlWindow.cpp | 2 +- 16 files changed, 40 insertions(+), 185 deletions(-) delete mode 100644 src/engine/events/RequestPortValueEvent.cpp delete mode 100644 src/engine/events/RequestPortValueEvent.hpp diff --git a/src/client/HTTPEngineSender.cpp b/src/client/HTTPEngineSender.cpp index 828af743..2afa32f1 100644 --- a/src/client/HTTPEngineSender.cpp +++ b/src/client/HTTPEngineSender.cpp @@ -245,12 +245,6 @@ HTTPEngineSender::request_object(const Path& path) } -void -HTTPEngineSender::request_port_value(const Path& port_path) -{ -} - - void HTTPEngineSender::request_variable(const Path& object_path, const URI& key) { diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp index 7de785fc..ffe60577 100644 --- a/src/client/HTTPEngineSender.hpp +++ b/src/client/HTTPEngineSender.hpp @@ -129,7 +129,6 @@ public: void ping(); void request_plugin(const Raul::URI& uri); void request_object(const Raul::Path& path); - void request_port_value(const Raul::Path& port_path); void request_variable(const Raul::Path& path, const Raul::URI& key); void request_property(const Raul::Path& path, const Raul::URI& key); void request_plugins(); diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp index 5bbbf5a0..45e7f82e 100644 --- a/src/client/OSCEngineSender.cpp +++ b/src/client/OSCEngineSender.cpp @@ -379,16 +379,6 @@ OSCEngineSender::request_object(const Path& path) } -void -OSCEngineSender::request_port_value(const Path& port_path) -{ - send("/ingen/request_port_value", "is", - next_id(), - port_path.c_str(), - LO_ARGS_END); -} - - void OSCEngineSender::request_variable(const Path& object_path, const URI& key) { diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp index 6771de71..0010a488 100644 --- a/src/client/OSCEngineSender.hpp +++ b/src/client/OSCEngineSender.hpp @@ -132,7 +132,6 @@ public: void ping(); void request_plugin(const Raul::URI& uri); void request_object(const Raul::Path& path); - void request_port_value(const Raul::Path& port_path); void request_variable(const Raul::Path& path, const Raul::URI& key); void request_property(const Raul::Path& path, const Raul::URI& key); void request_plugins(); diff --git a/src/common/interface/EngineInterface.hpp b/src/common/interface/EngineInterface.hpp index b8462226..5fdbffb8 100644 --- a/src/common/interface/EngineInterface.hpp +++ b/src/common/interface/EngineInterface.hpp @@ -72,8 +72,6 @@ public: virtual void request_object(const Raul::Path& path) = 0; - virtual void request_port_value(const Raul::Path& port_path) = 0; - virtual void request_variable(const Raul::Path& path, const Raul::URI& key) = 0; diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp index 759d59a5..d5707720 100644 --- a/src/engine/OSCEngineReceiver.cpp +++ b/src/engine/OSCEngineReceiver.cpp @@ -112,7 +112,6 @@ OSCEngineReceiver::OSCEngineReceiver(Engine& engine, size_t queue_size, uint16_t lo_server_add_method(_server, "/ingen/request_variable", "iss", variable_get_cb, this); lo_server_add_method(_server, "/ingen/request_plugin", "is", request_plugin_cb, this); lo_server_add_method(_server, "/ingen/request_object", "is", request_object_cb, this); - lo_server_add_method(_server, "/ingen/request_port_value", "is", request_port_value_cb, this); lo_server_add_method(_server, "/ingen/request_plugins", "i", request_plugins_cb, this); lo_server_add_method(_server, "/ingen/request_all_objects", "i", request_all_objects_cb, this); @@ -741,22 +740,6 @@ OSCEngineReceiver::_request_object_cb(const char* path, const char* types, lo_ar } -/** \page engine_osc_namespace - *

\b /ingen/request_port_value - Requests the engine send the value of a port. - * \arg \b response-id (integer) - * \arg \b port-path (string) - Full path of port to send the value of \n\n - * \li Reply will be sent to client registered with the source address of this message.

\n\n - */ -int -OSCEngineReceiver::_request_port_value_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) -{ - const char* port_path = &argv[1]->s; - - request_port_value(port_path); - return 0; -} - - /** \page engine_osc_namespace *

\b /ingen/request_plugins - Requests the engine send a list of all known plugins. * \arg \b response-id (integer) \n\n diff --git a/src/engine/OSCEngineReceiver.hpp b/src/engine/OSCEngineReceiver.hpp index b684d2c0..816d9542 100644 --- a/src/engine/OSCEngineReceiver.hpp +++ b/src/engine/OSCEngineReceiver.hpp @@ -110,7 +110,6 @@ private: LO_HANDLER(property_set); LO_HANDLER(request_plugin); LO_HANDLER(request_object); - LO_HANDLER(request_port_value); LO_HANDLER(request_variable); LO_HANDLER(request_plugins); LO_HANDLER(request_all_objects); diff --git a/src/engine/QueuedEngineInterface.cpp b/src/engine/QueuedEngineInterface.cpp index e475f1a6..5f4082fa 100644 --- a/src/engine/QueuedEngineInterface.cpp +++ b/src/engine/QueuedEngineInterface.cpp @@ -306,13 +306,6 @@ QueuedEngineInterface::request_object(const Path& path) } -void -QueuedEngineInterface::request_port_value(const Path& port_path) -{ - push_queued(new RequestPortValueEvent(_engine, _responder, now(), port_path)); -} - - void QueuedEngineInterface::request_variable(const Path& object_path, const URI& key) { diff --git a/src/engine/QueuedEngineInterface.hpp b/src/engine/QueuedEngineInterface.hpp index 1482cf2e..91fb14b0 100644 --- a/src/engine/QueuedEngineInterface.hpp +++ b/src/engine/QueuedEngineInterface.hpp @@ -127,7 +127,6 @@ public: virtual void ping(); virtual void request_plugin(const Raul::URI& uri); virtual void request_object(const Raul::Path& path); - virtual void request_port_value(const Raul::Path& port_path); virtual void request_variable(const Raul::Path& object_path, const Raul::URI& key); virtual void request_property(const Raul::Path& object_path, const Raul::URI& key); virtual void request_plugins(); diff --git a/src/engine/events.hpp b/src/engine/events.hpp index b5dcdbc0..b8a344de 100644 --- a/src/engine/events.hpp +++ b/src/engine/events.hpp @@ -41,7 +41,6 @@ #include "events/RequestObjectEvent.hpp" #include "events/RequestPluginEvent.hpp" #include "events/RequestPluginsEvent.hpp" -#include "events/RequestPortValueEvent.hpp" #include "events/SetMetadataEvent.hpp" #include "events/SetPortValueEvent.hpp" #include "events/UnregisterClientEvent.hpp" 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, @@ -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); @@ -64,11 +71,35 @@ RequestMetadataEvent::pre_process() } +void +RequestMetadataEvent::execute(ProcessContext& context) +{ + QueuedEvent::execute(context); + if (_special_type == PORT_VALUE) { + PortImpl* port = dynamic_cast(_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 - * - * 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, 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 - * - * 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, 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 diff --git a/src/engine/wscript b/src/engine/wscript index 66d6f29e..4365cfa9 100644 --- a/src/engine/wscript +++ b/src/engine/wscript @@ -76,7 +76,6 @@ def build(bld): events/RequestObjectEvent.cpp events/RequestPluginEvent.cpp events/RequestPluginsEvent.cpp - events/RequestPortValueEvent.cpp events/SetMetadataEvent.cpp events/UnregisterClientEvent.cpp ''' diff --git a/src/gui/NodeControlWindow.cpp b/src/gui/NodeControlWindow.cpp index 2ea2a55c..0384c934 100644 --- a/src/gui/NodeControlWindow.cpp +++ b/src/gui/NodeControlWindow.cpp @@ -117,7 +117,7 @@ NodeControlWindow::on_show() for (NodeModel::Ports::const_iterator i = _node->ports().begin(); i != _node->ports().end(); ++i) if ((*i)->type().is_control() && (*i)->is_input()) - App::instance().engine()->request_port_value((*i)->path()); + App::instance().engine()->request_variable((*i)->path(), "ingen:value"); if (_position_stored) move(_x, _y); -- cgit v1.2.1