From ce2e40f296f9360291ebbfd0fabc4b6c06b715c4 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 28 May 2009 21:36:11 +0000 Subject: Rename RequestObjectEvent GetEvent. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2036 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/QueuedEngineInterface.cpp | 2 +- src/engine/events.hpp | 4 +- src/engine/events/GetEvent.cpp | 86 ++++++++++++++++++++++++++++++++ src/engine/events/GetEvent.hpp | 56 +++++++++++++++++++++ src/engine/events/RequestObjectEvent.cpp | 86 -------------------------------- src/engine/events/RequestObjectEvent.hpp | 56 --------------------- src/engine/wscript | 2 +- 7 files changed, 146 insertions(+), 146 deletions(-) create mode 100644 src/engine/events/GetEvent.cpp create mode 100644 src/engine/events/GetEvent.hpp delete mode 100644 src/engine/events/RequestObjectEvent.cpp delete mode 100644 src/engine/events/RequestObjectEvent.hpp (limited to 'src/engine') diff --git a/src/engine/QueuedEngineInterface.cpp b/src/engine/QueuedEngineInterface.cpp index 8dd31adc..7e824cae 100644 --- a/src/engine/QueuedEngineInterface.cpp +++ b/src/engine/QueuedEngineInterface.cpp @@ -270,7 +270,7 @@ QueuedEngineInterface::ping() void QueuedEngineInterface::request_object(const URI& uri) { - push_queued(new RequestObjectEvent(_engine, _responder, now(), uri)); + push_queued(new GetEvent(_engine, _responder, now(), uri)); } diff --git a/src/engine/events.hpp b/src/engine/events.hpp index 78aea9ba..d9fb9362 100644 --- a/src/engine/events.hpp +++ b/src/engine/events.hpp @@ -30,15 +30,15 @@ #include "events/DeleteEvent.hpp" #include "events/DisconnectAllEvent.hpp" #include "events/DisconnectionEvent.hpp" +#include "events/GetEvent.hpp" #include "events/LoadPluginsEvent.hpp" #include "events/MidiLearnEvent.hpp" +#include "events/MoveEvent.hpp" #include "events/NoteEvent.hpp" #include "events/PingQueuedEvent.hpp" #include "events/RegisterClientEvent.hpp" -#include "events/MoveEvent.hpp" #include "events/RequestAllObjectsEvent.hpp" #include "events/RequestMetadataEvent.hpp" -#include "events/RequestObjectEvent.hpp" #include "events/RequestPluginsEvent.hpp" #include "events/SetMetadataEvent.hpp" #include "events/SetPortValueEvent.hpp" diff --git a/src/engine/events/GetEvent.cpp b/src/engine/events/GetEvent.cpp new file mode 100644 index 00000000..6479c94f --- /dev/null +++ b/src/engine/events/GetEvent.cpp @@ -0,0 +1,86 @@ +/* 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 "GetEvent.hpp" +#include "interface/ClientInterface.hpp" +#include "Responder.hpp" +#include "Engine.hpp" +#include "EngineStore.hpp" +#include "ClientBroadcaster.hpp" +#include "PatchImpl.hpp" +#include "NodeImpl.hpp" +#include "PortImpl.hpp" +#include "ObjectSender.hpp" +#include "ProcessContext.hpp" + +using namespace Raul; + +namespace Ingen { + + +GetEvent::GetEvent( + Engine& engine, + SharedPtr responder, + SampleCount timestamp, + const URI& uri) + : QueuedEvent(engine, responder, timestamp) + , _uri(uri) + , _object(NULL) + , _plugin(NULL) +{ +} + + +void +GetEvent::pre_process() +{ + 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(); +} + + +void +GetEvent::execute(ProcessContext& context) +{ + QueuedEvent::execute(context); + assert(_time >= context.start() && _time <= context.end()); +} + + +void +GetEvent::post_process() +{ + if (!_object && !_plugin) { + _responder->respond_error("Unable to find object requested."); + } else if (_responder->client()) { + _responder->respond_ok(); + if (_object) + _responder->client()->put(_uri, _object->properties()); + else if (_plugin) + _responder->client()->put(_uri, _plugin->properties()); + } else { + _responder->respond_error("Unable to find client to send object."); + } +} + + +} // namespace Ingen + diff --git a/src/engine/events/GetEvent.hpp b/src/engine/events/GetEvent.hpp new file mode 100644 index 00000000..d2413043 --- /dev/null +++ b/src/engine/events/GetEvent.hpp @@ -0,0 +1,56 @@ +/* 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 REQUESTOBJECTEVENT_H +#define REQUESTOBJECTEVENT_H + +#include "QueuedEvent.hpp" +#include "types.hpp" + +namespace Ingen { + +class GraphObjectImpl; +class PluginImpl; + + +/** A request from a client to send an object. + * + * \ingroup engine + */ +class GetEvent : public QueuedEvent +{ +public: + GetEvent( + 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; + GraphObjectImpl* _object; + const PluginImpl* _plugin; +}; + + +} // namespace Ingen + +#endif // REQUESTOBJECTEVENT_H diff --git a/src/engine/events/RequestObjectEvent.cpp b/src/engine/events/RequestObjectEvent.cpp deleted file mode 100644 index a74f15d3..00000000 --- a/src/engine/events/RequestObjectEvent.cpp +++ /dev/null @@ -1,86 +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 "RequestObjectEvent.hpp" -#include "interface/ClientInterface.hpp" -#include "Responder.hpp" -#include "Engine.hpp" -#include "EngineStore.hpp" -#include "ClientBroadcaster.hpp" -#include "PatchImpl.hpp" -#include "NodeImpl.hpp" -#include "PortImpl.hpp" -#include "ObjectSender.hpp" -#include "ProcessContext.hpp" - -using namespace Raul; - -namespace Ingen { - - -RequestObjectEvent::RequestObjectEvent( - Engine& engine, - SharedPtr responder, - SampleCount timestamp, - const URI& uri) - : QueuedEvent(engine, responder, timestamp) - , _uri(uri) - , _object(NULL) - , _plugin(NULL) -{ -} - - -void -RequestObjectEvent::pre_process() -{ - 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(); -} - - -void -RequestObjectEvent::execute(ProcessContext& context) -{ - QueuedEvent::execute(context); - assert(_time >= context.start() && _time <= context.end()); -} - - -void -RequestObjectEvent::post_process() -{ - if (!_object && !_plugin) { - _responder->respond_error("Unable to find object requested."); - } else if (_responder->client()) { - _responder->respond_ok(); - if (_object) - _responder->client()->put(_uri, _object->properties()); - else if (_plugin) - _responder->client()->put(_uri, _plugin->properties()); - } else { - _responder->respond_error("Unable to find client to send object."); - } -} - - -} // namespace Ingen - diff --git a/src/engine/events/RequestObjectEvent.hpp b/src/engine/events/RequestObjectEvent.hpp deleted file mode 100644 index cd759224..00000000 --- a/src/engine/events/RequestObjectEvent.hpp +++ /dev/null @@ -1,56 +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 REQUESTOBJECTEVENT_H -#define REQUESTOBJECTEVENT_H - -#include "QueuedEvent.hpp" -#include "types.hpp" - -namespace Ingen { - -class GraphObjectImpl; -class PluginImpl; - - -/** A request from a client to send an object. - * - * \ingroup engine - */ -class RequestObjectEvent : public QueuedEvent -{ -public: - RequestObjectEvent( - 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; - GraphObjectImpl* _object; - const PluginImpl* _plugin; -}; - - -} // namespace Ingen - -#endif // REQUESTOBJECTEVENT_H diff --git a/src/engine/wscript b/src/engine/wscript index bab84cf2..29189c59 100644 --- a/src/engine/wscript +++ b/src/engine/wscript @@ -65,6 +65,7 @@ def build(bld): events/DeleteEvent.cpp events/DisconnectAllEvent.cpp events/DisconnectionEvent.cpp + events/GetEvent.cpp events/LoadPluginsEvent.cpp events/MidiLearnEvent.cpp events/MoveEvent.cpp @@ -72,7 +73,6 @@ def build(bld): events/RegisterClientEvent.cpp events/RequestAllObjectsEvent.cpp events/RequestMetadataEvent.cpp - events/RequestObjectEvent.cpp events/RequestPluginsEvent.cpp events/SetMetadataEvent.cpp events/SetPortValueEvent.cpp -- cgit v1.2.1