From f2135439b806e9c375f2e8588be23ea53c69832c Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 28 May 2009 16:41:02 +0000 Subject: Merge request_object and request_plugin. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2028 a436a847-0d15-0410-975c-d299462d15a1 --- src/client/HTTPEngineSender.cpp | 8 +--- src/client/HTTPEngineSender.hpp | 3 +- src/client/OSCEngineSender.cpp | 14 +----- src/client/OSCEngineSender.hpp | 3 +- src/common/interface/EngineInterface.hpp | 4 +- src/engine/OSCEngineReceiver.cpp | 26 ++--------- src/engine/OSCEngineReceiver.hpp | 1 - src/engine/QueuedEngineInterface.cpp | 11 +---- src/engine/QueuedEngineInterface.hpp | 3 +- src/engine/events.hpp | 1 - src/engine/events/RequestObjectEvent.cpp | 22 +++++++-- src/engine/events/RequestObjectEvent.hpp | 12 +++-- src/engine/events/RequestPluginEvent.cpp | 78 -------------------------------- src/engine/events/RequestPluginEvent.hpp | 51 --------------------- src/engine/wscript | 1 - 15 files changed, 38 insertions(+), 200 deletions(-) delete mode 100644 src/engine/events/RequestPluginEvent.cpp delete mode 100644 src/engine/events/RequestPluginEvent.hpp (limited to 'src') diff --git a/src/client/HTTPEngineSender.cpp b/src/client/HTTPEngineSender.cpp index 18b92cad..0a9428e5 100644 --- a/src/client/HTTPEngineSender.cpp +++ b/src/client/HTTPEngineSender.cpp @@ -190,13 +190,7 @@ HTTPEngineSender::ping() void -HTTPEngineSender::request_plugin(const URI& uri) -{ -} - - -void -HTTPEngineSender::request_object(const Path& path) +HTTPEngineSender::request_object(const URI& uri) { } diff --git a/src/client/HTTPEngineSender.hpp b/src/client/HTTPEngineSender.hpp index ee27e1de..7ec4fac8 100644 --- a/src/client/HTTPEngineSender.hpp +++ b/src/client/HTTPEngineSender.hpp @@ -109,8 +109,7 @@ public: // Requests // void ping(); - void request_plugin(const Raul::URI& uri); - void request_object(const Raul::Path& path); + void request_object(const Raul::URI& uri); void request_variable(const Raul::URI& path, const Raul::URI& key); void request_property(const Raul::URI& path, const Raul::URI& key); void request_plugins(); diff --git a/src/client/OSCEngineSender.cpp b/src/client/OSCEngineSender.cpp index 775dd047..bcc39430 100644 --- a/src/client/OSCEngineSender.cpp +++ b/src/client/OSCEngineSender.cpp @@ -280,21 +280,11 @@ OSCEngineSender::ping() void -OSCEngineSender::request_plugin(const URI& uri) -{ - send("/ingen/request_plugin", "is", - next_id(), - uri.c_str(), - LO_ARGS_END); -} - - -void -OSCEngineSender::request_object(const Path& path) +OSCEngineSender::request_object(const URI& uri) { send("/ingen/request_object", "is", next_id(), - path.c_str(), + uri.c_str(), LO_ARGS_END); } diff --git a/src/client/OSCEngineSender.hpp b/src/client/OSCEngineSender.hpp index 187093d3..3f11f96c 100644 --- a/src/client/OSCEngineSender.hpp +++ b/src/client/OSCEngineSender.hpp @@ -112,8 +112,7 @@ public: // Requests // void ping(); - void request_plugin(const Raul::URI& uri); - void request_object(const Raul::Path& path); + void request_object(const Raul::URI& uri); void request_variable(const Raul::URI& path, const Raul::URI& key); void request_property(const Raul::URI& path, const Raul::URI& key); void request_plugins(); diff --git a/src/common/interface/EngineInterface.hpp b/src/common/interface/EngineInterface.hpp index 5db47d47..b8852a91 100644 --- a/src/common/interface/EngineInterface.hpp +++ b/src/common/interface/EngineInterface.hpp @@ -64,9 +64,7 @@ public: virtual void ping() = 0; - virtual void request_plugin(const Raul::URI& uri) = 0; - - virtual void request_object(const Raul::Path& path) = 0; + virtual void request_object(const Raul::URI& uri) = 0; virtual void request_variable(const Raul::URI& path, const Raul::URI& key) = 0; diff --git a/src/engine/OSCEngineReceiver.cpp b/src/engine/OSCEngineReceiver.cpp index e9a66665..912a2969 100644 --- a/src/engine/OSCEngineReceiver.cpp +++ b/src/engine/OSCEngineReceiver.cpp @@ -108,7 +108,6 @@ OSCEngineReceiver::OSCEngineReceiver(Engine& engine, size_t queue_size, uint16_t // Queries 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_plugins", "i", request_plugins_cb, this); lo_server_add_method(_server, "/ingen/request_all_objects", "i", request_all_objects_cb, this); @@ -686,36 +685,17 @@ OSCEngineReceiver::_variable_get_cb(const char* path, const char* types, lo_arg* } -/** \page engine_osc_namespace - *

/ingen/request_plugin

- * \arg \b response-id (integer) - * \arg \b port-path (string) - Full path of port to send the value of - * - * Request the value of a port. - */ -int -OSCEngineReceiver::_request_plugin_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) -{ - const char* uri = &argv[1]->s; - - request_plugin(uri); - return 0; -} - - /** \page engine_osc_namespace *

/ingen/request_object

* \arg \b response-id (integer) - * \arg \b port-path (string) - Full path of port to send the value of \n\n + * \arg \b uri (string) - URI of object (patch, port, node, plugin) to send * - * Request all properties of a graph object. + * Request all properties of an object. */ int OSCEngineReceiver::_request_object_cb(const char* path, const char* types, lo_arg** argv, int argc, lo_message msg) { - const char* object_path = &argv[1]->s; - - request_object(object_path); + request_object(&argv[1]->s); return 0; } diff --git a/src/engine/OSCEngineReceiver.hpp b/src/engine/OSCEngineReceiver.hpp index 10cc2b10..a4d25c29 100644 --- a/src/engine/OSCEngineReceiver.hpp +++ b/src/engine/OSCEngineReceiver.hpp @@ -104,7 +104,6 @@ private: LO_HANDLER(variable_get); LO_HANDLER(variable_set); LO_HANDLER(property_set); - LO_HANDLER(request_plugin); LO_HANDLER(request_object); LO_HANDLER(request_variable); LO_HANDLER(request_plugins); diff --git a/src/engine/QueuedEngineInterface.cpp b/src/engine/QueuedEngineInterface.cpp index 30cc1072..3608ceaf 100644 --- a/src/engine/QueuedEngineInterface.cpp +++ b/src/engine/QueuedEngineInterface.cpp @@ -268,16 +268,9 @@ QueuedEngineInterface::ping() void -QueuedEngineInterface::request_plugin(const URI& uri) +QueuedEngineInterface::request_object(const URI& uri) { - push_queued(new RequestPluginEvent(_engine, _responder, now(), uri)); -} - - -void -QueuedEngineInterface::request_object(const Path& path) -{ - push_queued(new RequestObjectEvent(_engine, _responder, now(), path)); + push_queued(new RequestObjectEvent(_engine, _responder, now(), uri)); } diff --git a/src/engine/QueuedEngineInterface.hpp b/src/engine/QueuedEngineInterface.hpp index 43237ac8..b4fb8912 100644 --- a/src/engine/QueuedEngineInterface.hpp +++ b/src/engine/QueuedEngineInterface.hpp @@ -108,8 +108,7 @@ public: // Requests // virtual void ping(); - virtual void request_plugin(const Raul::URI& uri); - virtual void request_object(const Raul::Path& path); + virtual void request_object(const Raul::URI& uri); virtual void request_variable(const Raul::URI& object_path, const Raul::URI& key); virtual void request_property(const Raul::URI& object_path, const Raul::URI& key); virtual void request_plugins(); diff --git a/src/engine/events.hpp b/src/engine/events.hpp index 8342fd45..78aea9ba 100644 --- a/src/engine/events.hpp +++ b/src/engine/events.hpp @@ -39,7 +39,6 @@ #include "events/RequestAllObjectsEvent.hpp" #include "events/RequestMetadataEvent.hpp" #include "events/RequestObjectEvent.hpp" -#include "events/RequestPluginEvent.hpp" #include "events/RequestPluginsEvent.hpp" #include "events/SetMetadataEvent.hpp" #include "events/SetPortValueEvent.hpp" diff --git a/src/engine/events/RequestObjectEvent.cpp b/src/engine/events/RequestObjectEvent.cpp index dac76f2b..c17e4983 100644 --- a/src/engine/events/RequestObjectEvent.cpp +++ b/src/engine/events/RequestObjectEvent.cpp @@ -32,10 +32,15 @@ using namespace Raul; namespace Ingen { -RequestObjectEvent::RequestObjectEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, const Path& path) +RequestObjectEvent::RequestObjectEvent( + Engine& engine, + SharedPtr responder, + SampleCount timestamp, + const URI& uri) : QueuedEvent(engine, responder, timestamp) - , _path(path) + , _uri(uri) , _object(NULL) + , _plugin(NULL) { } @@ -43,7 +48,10 @@ RequestObjectEvent::RequestObjectEvent(Engine& engine, SharedPtr resp void RequestObjectEvent::pre_process() { - _object = _engine.engine_store()->find_object(_path); + if (Path::is_valid(_uri.str())) + _object = _engine.engine_store()->find_object(Path(_uri.str())); + else + _plugin = _engine.node_factory()->plugin(_uri); QueuedEvent::pre_process(); } @@ -60,10 +68,14 @@ RequestObjectEvent::execute(ProcessContext& context) void RequestObjectEvent::post_process() { - if (!_object) { + if (!_object && !_plugin) { _responder->respond_error("Unable to find object requested."); } else if (_responder->client()) { - ObjectSender::send_object(_responder->client(), _object, true); + _responder->respond_ok(); + if (_object) + _responder->client()->put(_uri, _object->properties()); + else if (_plugin) + _responder->client()->new_plugin(_uri, _plugin->type_uri(), _plugin->symbol()); } else { _responder->respond_error("Unable to find client to send object."); } diff --git a/src/engine/events/RequestObjectEvent.hpp b/src/engine/events/RequestObjectEvent.hpp index 600724b6..67454892 100644 --- a/src/engine/events/RequestObjectEvent.hpp +++ b/src/engine/events/RequestObjectEvent.hpp @@ -24,6 +24,7 @@ namespace Ingen { class GraphObjectImpl; +class PluginImpl; /** A request from a client to send the value of a port. @@ -33,15 +34,20 @@ class GraphObjectImpl; class RequestObjectEvent : public QueuedEvent { public: - RequestObjectEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, const Raul::Path& port_path); + RequestObjectEvent( + Engine& engine, + SharedPtr responder, + SampleCount timestamp, + const Raul::URI& uri); void pre_process(); void execute(ProcessContext& context); void post_process(); private: - const Raul::Path _path; - GraphObjectImpl* _object; + const Raul::URI _uri; + GraphObjectImpl* _object; + const PluginImpl* _plugin; }; diff --git a/src/engine/events/RequestPluginEvent.cpp b/src/engine/events/RequestPluginEvent.cpp deleted file mode 100644 index e772bf04..00000000 --- a/src/engine/events/RequestPluginEvent.cpp +++ /dev/null @@ -1,78 +0,0 @@ -/* This file is part of Ingen. - * Copyright (C) 2007-2009 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 "interface/ClientInterface.hpp" -#include "RequestPluginEvent.hpp" -#include "Responder.hpp" -#include "Engine.hpp" -#include "PortImpl.hpp" -#include "EngineStore.hpp" -#include "ClientBroadcaster.hpp" -#include "NodeFactory.hpp" -#include "PluginImpl.hpp" -#include "ProcessContext.hpp" - -using namespace Raul; - -namespace Ingen { - - -RequestPluginEvent::RequestPluginEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, const URI& uri) - : QueuedEvent(engine, responder, timestamp) - , _uri(uri) - , _plugin(NULL) -{ -} - - -void -RequestPluginEvent::pre_process() -{ - _plugin = _engine.node_factory()->plugin(_uri); - - QueuedEvent::pre_process(); -} - - -void -RequestPluginEvent::execute(ProcessContext& context) -{ - QueuedEvent::execute(context); - assert(_time >= context.start() && _time <= context.end()); -} - - -void -RequestPluginEvent::post_process() -{ - if (!_plugin) { - _responder->respond_error("Unable to find plugin requested."); - - } else if (_responder->client()) { - - _responder->respond_ok(); - assert(_plugin->uri() == _uri); - _responder->client()->new_plugin(_uri, _plugin->type_uri(), _plugin->symbol()); - - } else { - _responder->respond_error("Unable to find client to send plugin."); - } -} - - -} // namespace Ingen - diff --git a/src/engine/events/RequestPluginEvent.hpp b/src/engine/events/RequestPluginEvent.hpp deleted file mode 100644 index b97f3a3e..00000000 --- a/src/engine/events/RequestPluginEvent.hpp +++ /dev/null @@ -1,51 +0,0 @@ -/* This file is part of Ingen. - * Copyright (C) 2007-2009 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 REQUESTPLUGINEVENT_H -#define REQUESTPLUGINEVENT_H - -#include "raul/URI.hpp" -#include "QueuedEvent.hpp" -#include "types.hpp" - -namespace Ingen { - -class PluginImpl; - - -/** A request from a client to send information about a plugin. - * - * \ingroup engine - */ -class RequestPluginEvent : public QueuedEvent -{ -public: - RequestPluginEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, const Raul::URI& uri); - - void pre_process(); - void execute(ProcessContext& context); - void post_process(); - -private: - const Raul::URI _uri; - const PluginImpl* _plugin; -}; - - -} // namespace Ingen - -#endif // REQUESTPLUGINEVENT_H diff --git a/src/engine/wscript b/src/engine/wscript index 157708e8..bab84cf2 100644 --- a/src/engine/wscript +++ b/src/engine/wscript @@ -73,7 +73,6 @@ def build(bld): events/RequestAllObjectsEvent.cpp events/RequestMetadataEvent.cpp events/RequestObjectEvent.cpp - events/RequestPluginEvent.cpp events/RequestPluginsEvent.cpp events/SetMetadataEvent.cpp events/SetPortValueEvent.cpp -- cgit v1.2.1