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/engine/events/RequestObjectEvent.cpp | 22 +++++++-- src/engine/events/RequestObjectEvent.hpp | 12 +++-- src/engine/events/RequestPluginEvent.cpp | 78 -------------------------------- src/engine/events/RequestPluginEvent.hpp | 51 --------------------- 4 files changed, 26 insertions(+), 137 deletions(-) delete mode 100644 src/engine/events/RequestPluginEvent.cpp delete mode 100644 src/engine/events/RequestPluginEvent.hpp (limited to 'src/engine/events') 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 -- cgit v1.2.1