From 5f71c5eecee673b0a1156d0fe56726750d17cb86 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 3 Jun 2009 01:25:01 +0000 Subject: Rename event classes to match new pretty file names. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2069 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/events/AllNotesOff.cpp | 8 ++++---- src/engine/events/AllNotesOff.hpp | 6 +++--- src/engine/events/ClearPatch.cpp | 8 ++++---- src/engine/events/ClearPatch.hpp | 4 ++-- src/engine/events/Connect.cpp | 8 ++++---- src/engine/events/Connect.hpp | 4 ++-- src/engine/events/CreateNode.cpp | 8 ++++---- src/engine/events/CreateNode.hpp | 4 ++-- src/engine/events/CreatePatch.cpp | 8 ++++---- src/engine/events/CreatePatch.hpp | 4 ++-- src/engine/events/CreatePort.cpp | 8 ++++---- src/engine/events/CreatePort.hpp | 4 ++-- src/engine/events/Deactivate.hpp | 4 ++-- src/engine/events/Delete.cpp | 14 +++++++------- src/engine/events/Delete.hpp | 10 +++++----- src/engine/events/Disconnect.cpp | 23 +++++++++++++++-------- src/engine/events/Disconnect.hpp | 17 ++++++++++++++--- src/engine/events/DisconnectAll.cpp | 28 ++++++++++++++-------------- src/engine/events/DisconnectAll.hpp | 32 +++++++++++++++++++++----------- src/engine/events/Get.cpp | 8 ++++---- src/engine/events/Get.hpp | 4 ++-- src/engine/events/LoadPlugins.cpp | 6 +++--- src/engine/events/LoadPlugins.hpp | 4 ++-- src/engine/events/MidiLearn.cpp | 8 ++++---- src/engine/events/MidiLearn.hpp | 4 ++-- src/engine/events/Move.cpp | 10 +++++----- src/engine/events/Move.hpp | 6 +++--- src/engine/events/Note.cpp | 8 ++++---- src/engine/events/Note.hpp | 6 +++--- src/engine/events/Ping.hpp | 4 ++-- src/engine/events/RegisterClient.cpp | 6 +++--- src/engine/events/RegisterClient.hpp | 4 ++-- src/engine/events/RequestAllObjects.cpp | 6 +++--- src/engine/events/RequestAllObjects.hpp | 4 ++-- src/engine/events/RequestMetadata.cpp | 8 ++++---- src/engine/events/RequestMetadata.hpp | 4 ++-- src/engine/events/RequestPlugins.cpp | 6 +++--- src/engine/events/RequestPlugins.hpp | 4 ++-- src/engine/events/SendPortActivity.cpp | 2 +- src/engine/events/SendPortActivity.hpp | 6 +++--- src/engine/events/SendPortValue.cpp | 2 +- src/engine/events/SendPortValue.hpp | 17 +++++++++-------- src/engine/events/SetMetadata.cpp | 14 +++++++------- src/engine/events/SetMetadata.hpp | 4 ++-- src/engine/events/SetPortValue.cpp | 14 +++++++------- src/engine/events/SetPortValue.hpp | 8 ++++---- src/engine/events/UnregisterClient.cpp | 4 ++-- src/engine/events/UnregisterClient.hpp | 4 ++-- 48 files changed, 208 insertions(+), 179 deletions(-) (limited to 'src/engine/events') diff --git a/src/engine/events/AllNotesOff.cpp b/src/engine/events/AllNotesOff.cpp index fa6c70e3..2ddec32b 100644 --- a/src/engine/events/AllNotesOff.cpp +++ b/src/engine/events/AllNotesOff.cpp @@ -30,7 +30,7 @@ namespace Events { /** Note off with patch explicitly passed - triggered by MIDI. */ -AllNotesOffEvent::AllNotesOffEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, PatchImpl* patch) +AllNotesOff::AllNotesOff(Engine& engine, SharedPtr responder, SampleCount timestamp, PatchImpl* patch) : Event(engine, responder, timestamp), _patch(patch) { @@ -39,7 +39,7 @@ AllNotesOffEvent::AllNotesOffEvent(Engine& engine, SharedPtr responde /** Note off event with lookup - triggered by OSC. */ -AllNotesOffEvent::AllNotesOffEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, const Path& patch_path) +AllNotesOff::AllNotesOff(Engine& engine, SharedPtr responder, SampleCount timestamp, const Path& patch_path) : Event(engine, responder, timestamp), _patch_path(patch_path), _patch(NULL) @@ -48,7 +48,7 @@ AllNotesOffEvent::AllNotesOffEvent(Engine& engine, SharedPtr responde void -AllNotesOffEvent::execute(ProcessContext& context) +AllNotesOff::execute(ProcessContext& context) { Event::execute(context); @@ -62,7 +62,7 @@ AllNotesOffEvent::execute(ProcessContext& context) void -AllNotesOffEvent::post_process() +AllNotesOff::post_process() { if (_patch != NULL) _responder->respond_ok(); diff --git a/src/engine/events/AllNotesOff.hpp b/src/engine/events/AllNotesOff.hpp index 32e677bf..77fcd651 100644 --- a/src/engine/events/AllNotesOff.hpp +++ b/src/engine/events/AllNotesOff.hpp @@ -31,11 +31,11 @@ namespace Events { * * \ingroup engine */ -class AllNotesOffEvent : public Event +class AllNotesOff : public Event { public: - AllNotesOffEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, PatchImpl* patch); - AllNotesOffEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, const Raul::Path& patch_path); + AllNotesOff(Engine& engine, SharedPtr responder, SampleCount timestamp, PatchImpl* patch); + AllNotesOff(Engine& engine, SharedPtr responder, SampleCount timestamp, const Raul::Path& patch_path); void execute(ProcessContext& context); void post_process(); diff --git a/src/engine/events/ClearPatch.cpp b/src/engine/events/ClearPatch.cpp index 084b78c9..3957294e 100644 --- a/src/engine/events/ClearPatch.cpp +++ b/src/engine/events/ClearPatch.cpp @@ -39,7 +39,7 @@ namespace Events { using namespace Shared; -ClearPatchEvent::ClearPatchEvent(Engine& engine, SharedPtr responder, FrameTime time, QueuedEventSource* source, const Path& patch_path) +ClearPatch::ClearPatch(Engine& engine, SharedPtr responder, FrameTime time, QueuedEventSource* source, const Path& patch_path) : QueuedEvent(engine, responder, time, true, source) , _patch_path(patch_path) , _process(false) @@ -51,7 +51,7 @@ ClearPatchEvent::ClearPatchEvent(Engine& engine, SharedPtr responder, void -ClearPatchEvent::pre_process() +ClearPatch::pre_process() { EngineStore::Objects::iterator patch_iterator = _engine.engine_store()->find(_patch_path); @@ -91,7 +91,7 @@ ClearPatchEvent::pre_process() void -ClearPatchEvent::execute(ProcessContext& context) +ClearPatch::execute(ProcessContext& context) { QueuedEvent::execute(context); @@ -128,7 +128,7 @@ ClearPatchEvent::execute(ProcessContext& context) void -ClearPatchEvent::post_process() +ClearPatch::post_process() { if (_patch != NULL) { delete _ports_array; diff --git a/src/engine/events/ClearPatch.hpp b/src/engine/events/ClearPatch.hpp index fbfb6e1a..9fd4cad3 100644 --- a/src/engine/events/ClearPatch.hpp +++ b/src/engine/events/ClearPatch.hpp @@ -37,10 +37,10 @@ namespace Events { * * \ingroup engine */ -class ClearPatchEvent : public QueuedEvent +class ClearPatch : public QueuedEvent { public: - ClearPatchEvent(Engine& engine, SharedPtr responder, FrameTime time, QueuedEventSource* source, const Raul::Path& patch_path); + ClearPatch(Engine& engine, SharedPtr responder, FrameTime time, QueuedEventSource* source, const Raul::Path& patch_path); void pre_process(); void execute(ProcessContext& context); diff --git a/src/engine/events/Connect.cpp b/src/engine/events/Connect.cpp index dbfb56ba..6c7bf2fe 100644 --- a/src/engine/events/Connect.cpp +++ b/src/engine/events/Connect.cpp @@ -40,7 +40,7 @@ namespace Events { using namespace Shared; -ConnectionEvent::ConnectionEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, const Path& src_port_path, const Path& dst_port_path) +Connect::Connect(Engine& engine, SharedPtr responder, SampleCount timestamp, const Path& src_port_path, const Path& dst_port_path) : QueuedEvent(engine, responder, timestamp) , _src_port_path(src_port_path) , _dst_port_path(dst_port_path) @@ -56,7 +56,7 @@ ConnectionEvent::ConnectionEvent(Engine& engine, SharedPtr responder, void -ConnectionEvent::pre_process() +Connect::pre_process() { if (_src_port_path.parent().parent() != _dst_port_path.parent().parent() && _src_port_path.parent() != _dst_port_path.parent().parent() @@ -154,7 +154,7 @@ ConnectionEvent::pre_process() void -ConnectionEvent::execute(ProcessContext& context) +Connect::execute(ProcessContext& context) { QueuedEvent::execute(context); @@ -169,7 +169,7 @@ ConnectionEvent::execute(ProcessContext& context) void -ConnectionEvent::post_process() +Connect::post_process() { std::ostringstream ss; if (_error == NO_ERROR) { diff --git a/src/engine/events/Connect.hpp b/src/engine/events/Connect.hpp index 0f9d8540..53b58e52 100644 --- a/src/engine/events/Connect.hpp +++ b/src/engine/events/Connect.hpp @@ -47,10 +47,10 @@ namespace Events { * * \ingroup engine */ -class ConnectionEvent : public QueuedEvent +class Connect : public QueuedEvent { public: - ConnectionEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, const Raul::Path& src_port_path, const Raul::Path& dst_port_path); + Connect(Engine& engine, SharedPtr responder, SampleCount timestamp, const Raul::Path& src_port_path, const Raul::Path& dst_port_path); void pre_process(); void execute(ProcessContext& context); diff --git a/src/engine/events/CreateNode.cpp b/src/engine/events/CreateNode.cpp index 372f1bcb..48d25348 100644 --- a/src/engine/events/CreateNode.cpp +++ b/src/engine/events/CreateNode.cpp @@ -41,7 +41,7 @@ namespace Events { using namespace Shared; -CreateNodeEvent::CreateNodeEvent( +CreateNode::CreateNode( Engine& engine, SharedPtr responder, SampleCount timestamp, @@ -73,7 +73,7 @@ CreateNodeEvent::CreateNodeEvent( void -CreateNodeEvent::pre_process() +CreateNode::pre_process() { if (_engine.engine_store()->find_object(_path) != NULL) { _node_already_exists = true; @@ -112,7 +112,7 @@ CreateNodeEvent::pre_process() void -CreateNodeEvent::execute(ProcessContext& context) +CreateNode::execute(ProcessContext& context) { QueuedEvent::execute(context); @@ -125,7 +125,7 @@ CreateNodeEvent::execute(ProcessContext& context) void -CreateNodeEvent::post_process() +CreateNode::post_process() { string msg; if (_node_already_exists) { diff --git a/src/engine/events/CreateNode.hpp b/src/engine/events/CreateNode.hpp index 560f7646..e44008e4 100644 --- a/src/engine/events/CreateNode.hpp +++ b/src/engine/events/CreateNode.hpp @@ -35,10 +35,10 @@ namespace Events { * * \ingroup engine */ -class CreateNodeEvent : public QueuedEvent +class CreateNode : public QueuedEvent { public: - CreateNodeEvent( + CreateNode( Engine& engine, SharedPtr responder, SampleCount timestamp, diff --git a/src/engine/events/CreatePatch.cpp b/src/engine/events/CreatePatch.cpp index c527937a..aab2e6f6 100644 --- a/src/engine/events/CreatePatch.cpp +++ b/src/engine/events/CreatePatch.cpp @@ -36,7 +36,7 @@ namespace Events { using namespace Shared; -CreatePatchEvent::CreatePatchEvent( +CreatePatch::CreatePatch( Engine& engine, SharedPtr responder, SampleCount timestamp, @@ -56,7 +56,7 @@ CreatePatchEvent::CreatePatchEvent( void -CreatePatchEvent::pre_process() +CreatePatch::pre_process() { if (_path.is_root() || _engine.engine_store()->find_object(_path) != NULL) { _error = OBJECT_EXISTS; @@ -106,7 +106,7 @@ CreatePatchEvent::pre_process() void -CreatePatchEvent::execute(ProcessContext& context) +CreatePatch::execute(ProcessContext& context) { QueuedEvent::execute(context); @@ -127,7 +127,7 @@ CreatePatchEvent::execute(ProcessContext& context) void -CreatePatchEvent::post_process() +CreatePatch::post_process() { string msg; if (_responder) { diff --git a/src/engine/events/CreatePatch.hpp b/src/engine/events/CreatePatch.hpp index 3aa400bc..15dee643 100644 --- a/src/engine/events/CreatePatch.hpp +++ b/src/engine/events/CreatePatch.hpp @@ -33,10 +33,10 @@ namespace Events { * * \ingroup engine */ -class CreatePatchEvent : public QueuedEvent +class CreatePatch : public QueuedEvent { public: - CreatePatchEvent( + CreatePatch( Engine& engine, SharedPtr responder, SampleCount timestamp, diff --git a/src/engine/events/CreatePort.cpp b/src/engine/events/CreatePort.cpp index 5fb6d64d..b64e57b2 100644 --- a/src/engine/events/CreatePort.cpp +++ b/src/engine/events/CreatePort.cpp @@ -44,7 +44,7 @@ namespace Events { using namespace Shared; -CreatePortEvent::CreatePortEvent( +CreatePort::CreatePort( Engine& engine, SharedPtr responder, SampleCount timestamp, @@ -80,7 +80,7 @@ CreatePortEvent::CreatePortEvent( void -CreatePortEvent::pre_process() +CreatePort::pre_process() { if (_error == UNKNOWN_TYPE || _engine.engine_store()->find_object(_path)) { QueuedEvent::pre_process(); @@ -138,7 +138,7 @@ CreatePortEvent::pre_process() void -CreatePortEvent::execute(ProcessContext& context) +CreatePort::execute(ProcessContext& context) { QueuedEvent::execute(context); @@ -158,7 +158,7 @@ CreatePortEvent::execute(ProcessContext& context) void -CreatePortEvent::post_process() +CreatePort::post_process() { string msg; switch (_error) { diff --git a/src/engine/events/CreatePort.hpp b/src/engine/events/CreatePort.hpp index 13cccfa6..a0b3d2a5 100644 --- a/src/engine/events/CreatePort.hpp +++ b/src/engine/events/CreatePort.hpp @@ -37,10 +37,10 @@ namespace Events { * * \ingroup engine */ -class CreatePortEvent : public QueuedEvent +class CreatePort : public QueuedEvent { public: - CreatePortEvent( + CreatePort( Engine& engine, SharedPtr responder, SampleCount timestamp, diff --git a/src/engine/events/Deactivate.hpp b/src/engine/events/Deactivate.hpp index c60b40b0..05d87520 100644 --- a/src/engine/events/Deactivate.hpp +++ b/src/engine/events/Deactivate.hpp @@ -29,10 +29,10 @@ namespace Events { * * \ingroup engine */ -class DeactivateEvent : public QueuedEvent +class Deactivate : public QueuedEvent { public: - DeactivateEvent(Engine& engine, SharedPtr responder, SampleCount timestamp) + Deactivate(Engine& engine, SharedPtr responder, SampleCount timestamp) : QueuedEvent(engine, responder, timestamp) {} diff --git a/src/engine/events/Delete.cpp b/src/engine/events/Delete.cpp index 259fbcc6..d8a8bef9 100644 --- a/src/engine/events/Delete.cpp +++ b/src/engine/events/Delete.cpp @@ -39,7 +39,7 @@ namespace Events { using namespace Shared; -DeleteEvent::DeleteEvent(Engine& engine, SharedPtr responder, FrameTime time, QueuedEventSource* source, const Raul::Path& path) +Delete::Delete(Engine& engine, SharedPtr responder, FrameTime time, QueuedEventSource* source, const Raul::Path& path) : QueuedEvent(engine, responder, time, true, source) , _path(path) , _store_iterator(engine.engine_store()->end()) @@ -54,14 +54,14 @@ DeleteEvent::DeleteEvent(Engine& engine, SharedPtr responder, FrameTi } -DeleteEvent::~DeleteEvent() +Delete::~Delete() { delete _disconnect_event; } void -DeleteEvent::pre_process() +Delete::pre_process() { _store_iterator = _engine.engine_store()->find(_path); @@ -82,7 +82,7 @@ DeleteEvent::pre_process() if (_patch_node_listnode) { assert(_patch_node_listnode->elem() == _node.get()); - _disconnect_event = new DisconnectAllEvent(_engine, _node->parent_patch(), _node.get()); + _disconnect_event = new DisconnectAll(_engine, _node->parent_patch(), _node.get()); _disconnect_event->pre_process(); if (_node->parent_patch()->enabled()) { @@ -103,7 +103,7 @@ DeleteEvent::pre_process() if (_patch_port_listnode) { assert(_patch_port_listnode->elem() == _port.get()); - _disconnect_event = new DisconnectAllEvent(_engine, _port->parent_patch(), _port.get()); + _disconnect_event = new DisconnectAll(_engine, _port->parent_patch(), _port.get()); _disconnect_event->pre_process(); if (_port->parent_patch()->enabled()) { @@ -121,7 +121,7 @@ DeleteEvent::pre_process() void -DeleteEvent::execute(ProcessContext& context) +Delete::execute(ProcessContext& context) { QueuedEvent::execute(context); @@ -170,7 +170,7 @@ DeleteEvent::execute(ProcessContext& context) void -DeleteEvent::post_process() +Delete::post_process() { if (!_node && !_port) { if (_path.is_root()) { diff --git a/src/engine/events/Delete.hpp b/src/engine/events/Delete.hpp index d5dc86da..a72dcc12 100644 --- a/src/engine/events/Delete.hpp +++ b/src/engine/events/Delete.hpp @@ -37,7 +37,7 @@ class CompiledPatch; namespace Events { -class DisconnectAllEvent; +class DisconnectAll; /** \page methods @@ -54,17 +54,17 @@ class DisconnectAllEvent; /** DELETE a graph object (see \ref methods). * \ingroup engine */ -class DeleteEvent : public QueuedEvent +class Delete : public QueuedEvent { public: - DeleteEvent( + Delete( Engine& engine, SharedPtr responder, FrameTime timestamp, QueuedEventSource* source, const Raul::Path& path); - ~DeleteEvent(); + ~Delete(); void pre_process(); void execute(ProcessContext& context); @@ -80,7 +80,7 @@ private: Raul::List::Node* _patch_port_listnode; Raul::Array* _ports_array; ///< New (external) ports for Patch CompiledPatch* _compiled_patch; ///< Patch's new process order - DisconnectAllEvent* _disconnect_event; + DisconnectAll* _disconnect_event; SharedPtr< Raul::Table > > _removed_table; }; diff --git a/src/engine/events/Disconnect.cpp b/src/engine/events/Disconnect.cpp index 6760b8d1..77878d43 100644 --- a/src/engine/events/Disconnect.cpp +++ b/src/engine/events/Disconnect.cpp @@ -34,10 +34,12 @@ namespace Ingen { namespace Events { -//// DisconnectionEvent //// - - -DisconnectionEvent::DisconnectionEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, const Raul::Path& src_port_path, const Raul::Path& dst_port_path) +Disconnect::Disconnect( + Engine& engine, + SharedPtr responder, + SampleCount timestamp, + const Raul::Path& src_port_path, + const Raul::Path& dst_port_path) : QueuedEvent(engine, responder, timestamp) , _src_port_path(src_port_path) , _dst_port_path(dst_port_path) @@ -52,7 +54,12 @@ DisconnectionEvent::DisconnectionEvent(Engine& engine, SharedPtr resp } -DisconnectionEvent::DisconnectionEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, PortImpl* const src_port, PortImpl* const dst_port) +Disconnect::Disconnect( + Engine& engine, + SharedPtr responder, + SampleCount timestamp, + PortImpl* const src_port, + PortImpl* const dst_port) : QueuedEvent(engine, responder, timestamp), _src_port_path(src_port->path()), _dst_port_path(dst_port->path()), @@ -73,7 +80,7 @@ DisconnectionEvent::DisconnectionEvent(Engine& engine, SharedPtr resp void -DisconnectionEvent::pre_process() +Disconnect::pre_process() { if (_lookup) { if (_src_port_path.parent().parent() != _dst_port_path.parent().parent() @@ -156,7 +163,7 @@ DisconnectionEvent::pre_process() void -DisconnectionEvent::execute(ProcessContext& context) +Disconnect::execute(ProcessContext& context) { QueuedEvent::execute(context); @@ -194,7 +201,7 @@ DisconnectionEvent::execute(ProcessContext& context) void -DisconnectionEvent::post_process() +Disconnect::post_process() { if (_error == NO_ERROR) { _responder->respond_ok(); diff --git a/src/engine/events/Disconnect.hpp b/src/engine/events/Disconnect.hpp index d5b8b823..652fd4b5 100644 --- a/src/engine/events/Disconnect.hpp +++ b/src/engine/events/Disconnect.hpp @@ -45,11 +45,22 @@ namespace Events { * * \ingroup engine */ -class DisconnectionEvent : public QueuedEvent +class Disconnect : public QueuedEvent { public: - DisconnectionEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, const Raul::Path& src_port_path, const Raul::Path& dst_port_path); - DisconnectionEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, PortImpl* const src_port, PortImpl* const dst_port); + Disconnect( + Engine& engine, + SharedPtr responder, + SampleCount timestamp, + const Raul::Path& src_port_path, + const Raul::Path& dst_port_path); + + Disconnect( + Engine& engine, + SharedPtr responder, + SampleCount timestamp, + PortImpl* const src_port, + PortImpl* const dst_port); void pre_process(); void execute(ProcessContext& context); diff --git a/src/engine/events/DisconnectAll.cpp b/src/engine/events/DisconnectAll.cpp index b4380f34..aedeadb7 100644 --- a/src/engine/events/DisconnectAll.cpp +++ b/src/engine/events/DisconnectAll.cpp @@ -41,7 +41,7 @@ namespace Ingen { namespace Events { -DisconnectAllEvent::DisconnectAllEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, const Path& parent_path, const Path& node_path) +DisconnectAll::DisconnectAll(Engine& engine, SharedPtr responder, SampleCount timestamp, const Path& parent_path, const Path& node_path) : QueuedEvent(engine, responder, timestamp) , _parent_path(parent_path) , _path(node_path) @@ -56,7 +56,7 @@ DisconnectAllEvent::DisconnectAllEvent(Engine& engine, SharedPtr resp /** Internal version for use by other events. */ -DisconnectAllEvent::DisconnectAllEvent(Engine& engine, PatchImpl* parent, GraphObjectImpl* object) +DisconnectAll::DisconnectAll(Engine& engine, PatchImpl* parent, GraphObjectImpl* object) : QueuedEvent(engine) , _parent_path(parent->path()) , _path(object->path()) @@ -69,15 +69,15 @@ DisconnectAllEvent::DisconnectAllEvent(Engine& engine, PatchImpl* parent, GraphO } -DisconnectAllEvent::~DisconnectAllEvent() +DisconnectAll::~DisconnectAll() { - for (Raul::List::iterator i = _disconnection_events.begin(); i != _disconnection_events.end(); ++i) + for (Raul::List::iterator i = _disconnect_events.begin(); i != _disconnect_events.end(); ++i) delete (*i); } void -DisconnectAllEvent::pre_process() +DisconnectAll::pre_process() { if (_lookup) { _parent = _engine.engine_store()->find_patch(_parent_path); @@ -115,10 +115,10 @@ DisconnectAllEvent::pre_process() ConnectionImpl* c = (ConnectionImpl*)i->get(); if ((c->src_port()->parent_node() == _node || c->dst_port()->parent_node() == _node) && !c->pending_disconnection()) { - DisconnectionEvent* ev = new DisconnectionEvent(_engine, + Disconnect* ev = new Disconnect(_engine, SharedPtr(new Responder()), _time, c->src_port(), c->dst_port()); ev->pre_process(); - _disconnection_events.push_back(new Raul::List::Node(ev)); + _disconnect_events.push_back(new Raul::List::Node(ev)); c->pending_disconnection(true); } } @@ -127,10 +127,10 @@ DisconnectAllEvent::pre_process() i != _parent->connections().end(); ++i) { ConnectionImpl* c = (ConnectionImpl*)i->get(); if ((c->src_port() == _port || c->dst_port() == _port) && !c->pending_disconnection()) { - DisconnectionEvent* ev = new DisconnectionEvent(_engine, + Disconnect* ev = new Disconnect(_engine, SharedPtr(new Responder()), _time, c->src_port(), c->dst_port()); ev->pre_process(); - _disconnection_events.push_back(new Raul::List::Node(ev)); + _disconnect_events.push_back(new Raul::List::Node(ev)); c->pending_disconnection(true); } } @@ -141,25 +141,25 @@ DisconnectAllEvent::pre_process() void -DisconnectAllEvent::execute(ProcessContext& context) +DisconnectAll::execute(ProcessContext& context) { QueuedEvent::execute(context); if (_error == NO_ERROR) { - for (Raul::List::iterator i = _disconnection_events.begin(); i != _disconnection_events.end(); ++i) + for (Raul::List::iterator i = _disconnect_events.begin(); i != _disconnect_events.end(); ++i) (*i)->execute(context); } } void -DisconnectAllEvent::post_process() +DisconnectAll::post_process() { if (_error == NO_ERROR) { if (_responder) _responder->respond_ok(); - for (Raul::List::iterator i = _disconnection_events.begin(); - i != _disconnection_events.end(); ++i) + for (Raul::List::iterator i = _disconnect_events.begin(); + i != _disconnect_events.end(); ++i) (*i)->post_process(); } else { if (_responder) { diff --git a/src/engine/events/DisconnectAll.hpp b/src/engine/events/DisconnectAll.hpp index de07b250..8cb3f9a2 100644 --- a/src/engine/events/DisconnectAll.hpp +++ b/src/engine/events/DisconnectAll.hpp @@ -33,19 +33,29 @@ class OutputPort; namespace Events { -class DisconnectionEvent; +class Disconnect; /** An event to disconnect all connections to a Node. * * \ingroup engine */ -class DisconnectAllEvent : public QueuedEvent +class DisconnectAll : public QueuedEvent { public: - DisconnectAllEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, const Raul::Path& parent_path, const Raul::Path& node_path); - DisconnectAllEvent(Engine& engine, PatchImpl* parent, GraphObjectImpl* object); - ~DisconnectAllEvent(); + DisconnectAll( + Engine& engine, + SharedPtr responder, + SampleCount timestamp, + const Raul::Path& parent_path, + const Raul::Path& node_path); + + DisconnectAll( + Engine& engine, + PatchImpl* parent, + GraphObjectImpl* object); + + ~DisconnectAll(); void pre_process(); void execute(ProcessContext& context); @@ -59,12 +69,12 @@ private: OBJECT_NOT_FOUND, }; - Raul::Path _parent_path; - Raul::Path _path; - PatchImpl* _parent; - NodeImpl* _node; - PortImpl* _port; - Raul::List _disconnection_events; + Raul::Path _parent_path; + Raul::Path _path; + PatchImpl* _parent; + NodeImpl* _node; + PortImpl* _port; + Raul::List _disconnect_events; bool _lookup; bool _disconnect_parent; diff --git a/src/engine/events/Get.cpp b/src/engine/events/Get.cpp index 06a3493b..6901adc3 100644 --- a/src/engine/events/Get.cpp +++ b/src/engine/events/Get.cpp @@ -33,7 +33,7 @@ namespace Ingen { namespace Events { -GetEvent::GetEvent( +Get::Get( Engine& engine, SharedPtr responder, SampleCount timestamp, @@ -47,7 +47,7 @@ GetEvent::GetEvent( void -GetEvent::pre_process() +Get::pre_process() { if (Path::is_valid(_uri.str())) _object = _engine.engine_store()->find_object(Path(_uri.str())); @@ -59,7 +59,7 @@ GetEvent::pre_process() void -GetEvent::execute(ProcessContext& context) +Get::execute(ProcessContext& context) { QueuedEvent::execute(context); assert(_time >= context.start() && _time <= context.end()); @@ -67,7 +67,7 @@ GetEvent::execute(ProcessContext& context) void -GetEvent::post_process() +Get::post_process() { if (!_object && !_plugin) { _responder->respond_error("Unable to find object requested."); diff --git a/src/engine/events/Get.hpp b/src/engine/events/Get.hpp index e1ede451..81d86b25 100644 --- a/src/engine/events/Get.hpp +++ b/src/engine/events/Get.hpp @@ -33,10 +33,10 @@ namespace Events { * * \ingroup engine */ -class GetEvent : public QueuedEvent +class Get : public QueuedEvent { public: - GetEvent( + Get( Engine& engine, SharedPtr responder, SampleCount timestamp, diff --git a/src/engine/events/LoadPlugins.cpp b/src/engine/events/LoadPlugins.cpp index b9276954..4b16048f 100644 --- a/src/engine/events/LoadPlugins.cpp +++ b/src/engine/events/LoadPlugins.cpp @@ -26,14 +26,14 @@ namespace Ingen { namespace Events { -LoadPluginsEvent::LoadPluginsEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, QueuedEventSource* source) +LoadPlugins::LoadPlugins(Engine& engine, SharedPtr responder, SampleCount timestamp, QueuedEventSource* source) : QueuedEvent(engine, responder, timestamp, true, source) { /* FIXME: Not sure why this has to be blocking, but it fixes some nasty bugs.. */ } void -LoadPluginsEvent::pre_process() +LoadPlugins::pre_process() { _engine.node_factory()->load_plugins(); @@ -41,7 +41,7 @@ LoadPluginsEvent::pre_process() } void -LoadPluginsEvent::post_process() +LoadPlugins::post_process() { if (_source) _source->unblock(); diff --git a/src/engine/events/LoadPlugins.hpp b/src/engine/events/LoadPlugins.hpp index 646acb45..5f38c9c9 100644 --- a/src/engine/events/LoadPlugins.hpp +++ b/src/engine/events/LoadPlugins.hpp @@ -28,10 +28,10 @@ namespace Events { * * \ingroup engine */ -class LoadPluginsEvent : public QueuedEvent +class LoadPlugins : public QueuedEvent { public: - LoadPluginsEvent(Engine& engine, + LoadPlugins(Engine& engine, SharedPtr responder, SampleCount timestamp, QueuedEventSource* source); diff --git a/src/engine/events/MidiLearn.cpp b/src/engine/events/MidiLearn.cpp index 00ea4f75..c475833b 100644 --- a/src/engine/events/MidiLearn.cpp +++ b/src/engine/events/MidiLearn.cpp @@ -30,7 +30,7 @@ namespace Ingen { namespace Events { -MidiLearnEvent::MidiLearnEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, const Raul::Path& node_path) +MidiLearn::MidiLearn(Engine& engine, SharedPtr responder, SampleCount timestamp, const Raul::Path& node_path) : QueuedEvent(engine, responder, timestamp) , _error(NO_ERROR) , _node_path(node_path) @@ -40,7 +40,7 @@ MidiLearnEvent::MidiLearnEvent(Engine& engine, SharedPtr responder, S void -MidiLearnEvent::pre_process() +MidiLearn::pre_process() { _node = _engine.engine_store()->find_node(_node_path); @@ -49,7 +49,7 @@ MidiLearnEvent::pre_process() void -MidiLearnEvent::execute(ProcessContext& context) +MidiLearn::execute(ProcessContext& context) { QueuedEvent::execute(context); @@ -64,7 +64,7 @@ MidiLearnEvent::execute(ProcessContext& context) void -MidiLearnEvent::post_process() +MidiLearn::post_process() { if (_error == NO_ERROR) { _responder->respond_ok(); diff --git a/src/engine/events/MidiLearn.hpp b/src/engine/events/MidiLearn.hpp index 3b13c896..061c9b7f 100644 --- a/src/engine/events/MidiLearn.hpp +++ b/src/engine/events/MidiLearn.hpp @@ -33,10 +33,10 @@ namespace Events { * * \ingroup engine */ -class MidiLearnEvent : public QueuedEvent +class MidiLearn : public QueuedEvent { public: - MidiLearnEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, const Raul::Path& node_path); + MidiLearn(Engine& engine, SharedPtr responder, SampleCount timestamp, const Raul::Path& node_path); void pre_process(); void execute(ProcessContext& context); diff --git a/src/engine/events/Move.cpp b/src/engine/events/Move.cpp index f90bf244..1b12819e 100644 --- a/src/engine/events/Move.cpp +++ b/src/engine/events/Move.cpp @@ -35,7 +35,7 @@ namespace Events { using namespace Shared; -MoveEvent::MoveEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, const Path& path, const Path& new_path) +Move::Move(Engine& engine, SharedPtr responder, SampleCount timestamp, const Path& path, const Path& new_path) : QueuedEvent(engine, responder, timestamp) , _old_path(path) , _new_path(new_path) @@ -46,13 +46,13 @@ MoveEvent::MoveEvent(Engine& engine, SharedPtr responder, SampleCount } -MoveEvent::~MoveEvent() +Move::~Move() { } void -MoveEvent::pre_process() +Move::pre_process() { if (!_old_path.parent().is_parent_of(_new_path)) { _error = PARENT_DIFFERS; @@ -98,7 +98,7 @@ MoveEvent::pre_process() void -MoveEvent::execute(ProcessContext& context) +Move::execute(ProcessContext& context) { QueuedEvent::execute(context); @@ -118,7 +118,7 @@ MoveEvent::execute(ProcessContext& context) void -MoveEvent::post_process() +Move::post_process() { string msg = "Unable to rename object - "; diff --git a/src/engine/events/Move.hpp b/src/engine/events/Move.hpp index 5ef81c93..7effaae0 100644 --- a/src/engine/events/Move.hpp +++ b/src/engine/events/Move.hpp @@ -42,16 +42,16 @@ namespace Events { /** MOVE a graph object to a new path (see \ref methods). * \ingroup engine */ -class MoveEvent : public QueuedEvent +class Move : public QueuedEvent { public: - MoveEvent( + Move( Engine& engine, SharedPtr responder, SampleCount timestamp, const Raul::Path& old_path, const Raul::Path& new_path); - ~MoveEvent(); + ~Move(); void pre_process(); void execute(ProcessContext& context); diff --git a/src/engine/events/Note.cpp b/src/engine/events/Note.cpp index b6ad7a2a..2bf71068 100644 --- a/src/engine/events/Note.cpp +++ b/src/engine/events/Note.cpp @@ -36,7 +36,7 @@ namespace Events { * * Used to be triggered by MIDI. Not used anymore. */ -NoteEvent::NoteEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, NodeImpl* node, bool on, uint8_t note_num, uint8_t velocity) +Note::Note(Engine& engine, SharedPtr responder, SampleCount timestamp, NodeImpl* node, bool on, uint8_t note_num, uint8_t velocity) : Event(engine, responder, timestamp), _node(node), _on(on), @@ -50,7 +50,7 @@ NoteEvent::NoteEvent(Engine& engine, SharedPtr responder, SampleCount * * Triggered by OSC. */ -NoteEvent::NoteEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, const Path& node_path, bool on, uint8_t note_num, uint8_t velocity) +Note::Note(Engine& engine, SharedPtr responder, SampleCount timestamp, const Path& node_path, bool on, uint8_t note_num, uint8_t velocity) : Event(engine, responder, timestamp), _node(NULL), _node_path(node_path), @@ -62,7 +62,7 @@ NoteEvent::NoteEvent(Engine& engine, SharedPtr responder, SampleCount void -NoteEvent::execute(ProcessContext& context) +Note::execute(ProcessContext& context) { Event::execute(context); assert(_time >= context.start() && _time <= context.end()); @@ -90,7 +90,7 @@ NoteEvent::execute(ProcessContext& context) void -NoteEvent::post_process() +Note::post_process() { if (_responder) { if (_node) diff --git a/src/engine/events/Note.hpp b/src/engine/events/Note.hpp index bb9d7989..9d895652 100644 --- a/src/engine/events/Note.hpp +++ b/src/engine/events/Note.hpp @@ -32,10 +32,10 @@ namespace Events { * * \ingroup engine */ -class NoteEvent : public Event +class Note : public Event { public: - NoteEvent(Engine& engine, + Note(Engine& engine, SharedPtr responder, SampleCount timestamp, NodeImpl* node, @@ -43,7 +43,7 @@ public: uint8_t note_num, uint8_t velocity); - NoteEvent(Engine& engine, + Note(Engine& engine, SharedPtr responder, SampleCount timestamp, const Raul::Path& node_path, diff --git a/src/engine/events/Ping.hpp b/src/engine/events/Ping.hpp index cfb574ac..8a8b554d 100644 --- a/src/engine/events/Ping.hpp +++ b/src/engine/events/Ping.hpp @@ -34,10 +34,10 @@ namespace Events { * * \ingroup engine */ -class PingQueuedEvent : public QueuedEvent +class Ping : public QueuedEvent { public: - PingQueuedEvent(Engine& engine, SharedPtr responder, SampleCount timestamp) + Ping(Engine& engine, SharedPtr responder, SampleCount timestamp) : QueuedEvent(engine, responder, timestamp) {} diff --git a/src/engine/events/RegisterClient.cpp b/src/engine/events/RegisterClient.cpp index 701075be..54368acb 100644 --- a/src/engine/events/RegisterClient.cpp +++ b/src/engine/events/RegisterClient.cpp @@ -26,7 +26,7 @@ namespace Ingen { namespace Events { -RegisterClientEvent::RegisterClientEvent(Engine& engine, +RegisterClient::RegisterClient(Engine& engine, SharedPtr responder, SampleCount timestamp, const URI& uri, @@ -39,7 +39,7 @@ RegisterClientEvent::RegisterClientEvent(Engine& engine, void -RegisterClientEvent::pre_process() +RegisterClient::pre_process() { _engine.broadcaster()->register_client(_uri, _client); @@ -48,7 +48,7 @@ RegisterClientEvent::pre_process() void -RegisterClientEvent::post_process() +RegisterClient::post_process() { _responder->respond_ok(); } diff --git a/src/engine/events/RegisterClient.hpp b/src/engine/events/RegisterClient.hpp index d72c1d5a..92c62cc7 100644 --- a/src/engine/events/RegisterClient.hpp +++ b/src/engine/events/RegisterClient.hpp @@ -30,10 +30,10 @@ namespace Events { * * \ingroup engine */ -class RegisterClientEvent : public QueuedEvent +class RegisterClient : public QueuedEvent { public: - RegisterClientEvent(Engine& engine, + RegisterClient(Engine& engine, SharedPtr responder, SampleCount timestamp, const Raul::URI& uri, diff --git a/src/engine/events/RequestAllObjects.cpp b/src/engine/events/RequestAllObjects.cpp index 998566a4..91e58e1e 100644 --- a/src/engine/events/RequestAllObjects.cpp +++ b/src/engine/events/RequestAllObjects.cpp @@ -27,21 +27,21 @@ namespace Ingen { namespace Events { -RequestAllObjectsEvent::RequestAllObjectsEvent(Engine& engine, SharedPtr responder, SampleCount timestamp) +RequestAllObjects::RequestAllObjects(Engine& engine, SharedPtr responder, SampleCount timestamp) : QueuedEvent(engine, responder, timestamp) { } void -RequestAllObjectsEvent::pre_process() +RequestAllObjects::pre_process() { QueuedEvent::pre_process(); } void -RequestAllObjectsEvent::post_process() +RequestAllObjects::post_process() { if (_responder->client()) { _responder->respond_ok(); diff --git a/src/engine/events/RequestAllObjects.hpp b/src/engine/events/RequestAllObjects.hpp index 260c70ac..1499a83c 100644 --- a/src/engine/events/RequestAllObjects.hpp +++ b/src/engine/events/RequestAllObjects.hpp @@ -28,10 +28,10 @@ namespace Events { * * \ingroup engine */ -class RequestAllObjectsEvent : public QueuedEvent +class RequestAllObjects : public QueuedEvent { public: - RequestAllObjectsEvent(Engine& engine, SharedPtr responder, SampleCount timestamp); + RequestAllObjects(Engine& engine, SharedPtr responder, SampleCount timestamp); void pre_process(); void post_process(); diff --git a/src/engine/events/RequestMetadata.cpp b/src/engine/events/RequestMetadata.cpp index 8ffcb513..145260ef 100644 --- a/src/engine/events/RequestMetadata.cpp +++ b/src/engine/events/RequestMetadata.cpp @@ -35,7 +35,7 @@ namespace Events { using namespace Shared; -RequestMetadataEvent::RequestMetadataEvent(Engine& engine, +RequestMetadata::RequestMetadata(Engine& engine, SharedPtr responder, SampleCount timestamp, bool is_meta, @@ -53,7 +53,7 @@ RequestMetadataEvent::RequestMetadataEvent(Engine& engine, void -RequestMetadataEvent::pre_process() +RequestMetadata::pre_process() { const bool is_object = (_uri.scheme() == Path::scheme && Path::is_valid(_uri.str())); if (_responder->client()) { @@ -85,7 +85,7 @@ RequestMetadataEvent::pre_process() void -RequestMetadataEvent::execute(ProcessContext& context) +RequestMetadata::execute(ProcessContext& context) { QueuedEvent::execute(context); if (_special_type == PORT_VALUE) { @@ -101,7 +101,7 @@ RequestMetadataEvent::execute(ProcessContext& context) void -RequestMetadataEvent::post_process() +RequestMetadata::post_process() { if (_responder->client()) { if (_special_type == PORT_VALUE) { diff --git a/src/engine/events/RequestMetadata.hpp b/src/engine/events/RequestMetadata.hpp index 23a528b7..ba860aaf 100644 --- a/src/engine/events/RequestMetadata.hpp +++ b/src/engine/events/RequestMetadata.hpp @@ -41,10 +41,10 @@ namespace Events { * * \ingroup engine */ -class RequestMetadataEvent : public QueuedEvent +class RequestMetadata : public QueuedEvent { public: - RequestMetadataEvent(Engine& engine, + RequestMetadata(Engine& engine, SharedPtr responder, SampleCount timestamp, bool meta, diff --git a/src/engine/events/RequestPlugins.cpp b/src/engine/events/RequestPlugins.cpp index b54888c3..95fd5ddf 100644 --- a/src/engine/events/RequestPlugins.cpp +++ b/src/engine/events/RequestPlugins.cpp @@ -25,14 +25,14 @@ namespace Ingen { namespace Events { -RequestPluginsEvent::RequestPluginsEvent(Engine& engine, SharedPtr responder, SampleCount timestamp) +RequestPlugins::RequestPlugins(Engine& engine, SharedPtr responder, SampleCount timestamp) : QueuedEvent(engine, responder, timestamp) { } void -RequestPluginsEvent::pre_process() +RequestPlugins::pre_process() { // Take a copy to send in the post processing thread (to avoid problems // because std::map isn't thread safe) @@ -43,7 +43,7 @@ RequestPluginsEvent::pre_process() void -RequestPluginsEvent::post_process() +RequestPlugins::post_process() { if (_responder->client()) { _engine.broadcaster()->send_plugins_to(_responder->client(), _plugins); diff --git a/src/engine/events/RequestPlugins.hpp b/src/engine/events/RequestPlugins.hpp index 8eb98492..16f878db 100644 --- a/src/engine/events/RequestPlugins.hpp +++ b/src/engine/events/RequestPlugins.hpp @@ -32,10 +32,10 @@ namespace Events { * * \ingroup engine */ -class RequestPluginsEvent : public QueuedEvent +class RequestPlugins : public QueuedEvent { public: - RequestPluginsEvent(Engine& engine, SharedPtr responder, SampleCount timestamp); + RequestPlugins(Engine& engine, SharedPtr responder, SampleCount timestamp); void pre_process(); void post_process(); diff --git a/src/engine/events/SendPortActivity.cpp b/src/engine/events/SendPortActivity.cpp index 580f347f..bf927da7 100644 --- a/src/engine/events/SendPortActivity.cpp +++ b/src/engine/events/SendPortActivity.cpp @@ -25,7 +25,7 @@ namespace Events { void -SendPortActivityEvent::post_process() +SendPortActivity::post_process() { _engine.broadcaster()->send_activity(_port->path()); } diff --git a/src/engine/events/SendPortActivity.hpp b/src/engine/events/SendPortActivity.hpp index bc2cb21f..0dd08924 100644 --- a/src/engine/events/SendPortActivity.hpp +++ b/src/engine/events/SendPortActivity.hpp @@ -40,10 +40,10 @@ namespace Events { * * \ingroup engine */ -class SendPortActivityEvent : public Event +class SendPortActivity : public Event { public: - inline SendPortActivityEvent(Engine& engine, + inline SendPortActivity(Engine& engine, SampleCount timestamp, PortImpl* port) : Event(engine, SharedPtr(), timestamp) @@ -51,7 +51,7 @@ public: { } - inline void operator=(const SendPortActivityEvent& ev) { + inline void operator=(const SendPortActivity& ev) { _port = ev._port; } diff --git a/src/engine/events/SendPortValue.cpp b/src/engine/events/SendPortValue.cpp index 170399a4..dbf0073f 100644 --- a/src/engine/events/SendPortValue.cpp +++ b/src/engine/events/SendPortValue.cpp @@ -28,7 +28,7 @@ namespace Events { void -SendPortValueEvent::post_process() +SendPortValue::post_process() { // FIXME... diff --git a/src/engine/events/SendPortValue.hpp b/src/engine/events/SendPortValue.hpp index 051070b7..d3ac61f7 100644 --- a/src/engine/events/SendPortValue.hpp +++ b/src/engine/events/SendPortValue.hpp @@ -39,15 +39,16 @@ namespace Events { * * \ingroup engine */ -class SendPortValueEvent : public Event +class SendPortValue : public Event { public: - inline SendPortValueEvent(Engine& engine, - SampleCount timestamp, - PortImpl* port, - bool omni, - uint32_t voice_num, - Sample value) + inline SendPortValue( + Engine& engine, + SampleCount timestamp, + PortImpl* port, + bool omni, + uint32_t voice_num, + Sample value) : Event(engine, SharedPtr(), timestamp) , _port(port) , _omni(omni) @@ -56,7 +57,7 @@ public: { } - inline void operator=(const SendPortValueEvent& ev) { + inline void operator=(const SendPortValue& ev) { _port = ev._port; _omni = ev._omni; _voice_num = ev._voice_num; diff --git a/src/engine/events/SetMetadata.cpp b/src/engine/events/SetMetadata.cpp index ad0be1f9..bc73e793 100644 --- a/src/engine/events/SetMetadata.cpp +++ b/src/engine/events/SetMetadata.cpp @@ -42,7 +42,7 @@ using namespace Shared; typedef Shared::Resource::Properties Properties; -SetMetadataEvent::SetMetadataEvent( +SetMetadata::SetMetadata( Engine& engine, SharedPtr responder, SampleCount timestamp, @@ -65,7 +65,7 @@ SetMetadataEvent::SetMetadataEvent( void -SetMetadataEvent::pre_process() +SetMetadata::pre_process() { typedef Properties::const_iterator iterator; @@ -91,15 +91,15 @@ SetMetadataEvent::pre_process() iterator p = _properties.find("ingen:polyphony"); if (p != _properties.end() && p->second.is_valid() && p->second.type() == Atom::INT) poly = p->second.get_int32(); - _create_event = new CreatePatchEvent(_engine, _responder, _time, + _create_event = new CreatePatch(_engine, _responder, _time, path, poly, _properties); } else if (is_node) { const iterator p = _properties.find("rdf:instanceOf"); - _create_event = new CreateNodeEvent(_engine, _responder, _time, + _create_event = new CreateNode(_engine, _responder, _time, path, p->second.get_uri(), true, _properties); } else if (is_port) { _blocking = true; - _create_event = new CreatePortEvent(_engine, _responder, _time, + _create_event = new CreatePort(_engine, _responder, _time, path, data_type.uri(), is_output, _source, _properties); } if (_create_event) @@ -164,7 +164,7 @@ SetMetadataEvent::pre_process() void -SetMetadataEvent::execute(ProcessContext& context) +SetMetadata::execute(ProcessContext& context) { if (_error != NO_ERROR) { QueuedEvent::execute(context); @@ -217,7 +217,7 @@ SetMetadataEvent::execute(ProcessContext& context) void -SetMetadataEvent::post_process() +SetMetadata::post_process() { switch (_error) { case NO_ERROR: diff --git a/src/engine/events/SetMetadata.hpp b/src/engine/events/SetMetadata.hpp index f9f375fc..3fd3c904 100644 --- a/src/engine/events/SetMetadata.hpp +++ b/src/engine/events/SetMetadata.hpp @@ -60,10 +60,10 @@ namespace Events { /** Set properties of a graph object. * \ingroup engine */ -class SetMetadataEvent : public QueuedEvent +class SetMetadata : public QueuedEvent { public: - SetMetadataEvent( + SetMetadata( Engine& engine, SharedPtr responder, SampleCount timestamp, diff --git a/src/engine/events/SetPortValue.cpp b/src/engine/events/SetPortValue.cpp index 4078b7c2..cd845d3f 100644 --- a/src/engine/events/SetPortValue.cpp +++ b/src/engine/events/SetPortValue.cpp @@ -42,7 +42,7 @@ using namespace Shared; /** Omni (all voices) control setting */ -SetPortValueEvent::SetPortValueEvent(Engine& engine, +SetPortValue::SetPortValue(Engine& engine, SharedPtr responder, bool queued, SampleCount timestamp, @@ -61,7 +61,7 @@ SetPortValueEvent::SetPortValueEvent(Engine& engine, /** Voice-specific control setting */ -SetPortValueEvent::SetPortValueEvent(Engine& engine, +SetPortValue::SetPortValue(Engine& engine, SharedPtr responder, bool queued, SampleCount timestamp, @@ -80,13 +80,13 @@ SetPortValueEvent::SetPortValueEvent(Engine& engine, } -SetPortValueEvent::~SetPortValueEvent() +SetPortValue::~SetPortValue() { } void -SetPortValueEvent::pre_process() +SetPortValue::pre_process() { if (_queued) { if (_port == NULL) @@ -107,7 +107,7 @@ SetPortValueEvent::pre_process() void -SetPortValueEvent::execute(ProcessContext& context) +SetPortValue::execute(ProcessContext& context) { Event::execute(context); assert(_time >= context.start() && _time <= context.end()); @@ -120,7 +120,7 @@ SetPortValueEvent::execute(ProcessContext& context) void -SetPortValueEvent::apply(uint32_t start, uint32_t nframes) +SetPortValue::apply(uint32_t start, uint32_t nframes) { if (_error == NO_ERROR && !_port) _port = _engine.engine_store()->find_port(_port_path); @@ -195,7 +195,7 @@ SetPortValueEvent::apply(uint32_t start, uint32_t nframes) void -SetPortValueEvent::post_process() +SetPortValue::post_process() { string msg; std::ostringstream ss; diff --git a/src/engine/events/SetPortValue.hpp b/src/engine/events/SetPortValue.hpp index 701ab09f..4572e431 100644 --- a/src/engine/events/SetPortValue.hpp +++ b/src/engine/events/SetPortValue.hpp @@ -38,17 +38,17 @@ namespace Events { * * \ingroup engine */ -class SetPortValueEvent : public QueuedEvent +class SetPortValue : public QueuedEvent { public: - SetPortValueEvent(Engine& engine, + SetPortValue(Engine& engine, SharedPtr responder, bool queued, SampleCount timestamp, const Raul::Path& port_path, const Raul::Atom& value); - SetPortValueEvent(Engine& engine, + SetPortValue(Engine& engine, SharedPtr responder, bool queued, SampleCount timestamp, @@ -56,7 +56,7 @@ public: const Raul::Path& port_path, const Raul::Atom& value); - ~SetPortValueEvent(); + ~SetPortValue(); void pre_process(); void execute(ProcessContext& context); diff --git a/src/engine/events/UnregisterClient.cpp b/src/engine/events/UnregisterClient.cpp index 13bf2d47..8eedeff9 100644 --- a/src/engine/events/UnregisterClient.cpp +++ b/src/engine/events/UnregisterClient.cpp @@ -27,7 +27,7 @@ namespace Ingen { namespace Events { -UnregisterClientEvent::UnregisterClientEvent(Engine& engine, SharedPtr responder, SampleCount timestamp, const URI& uri) +UnregisterClient::UnregisterClient(Engine& engine, SharedPtr responder, SampleCount timestamp, const URI& uri) : QueuedEvent(engine, responder, timestamp) , _uri(uri) { @@ -35,7 +35,7 @@ UnregisterClientEvent::UnregisterClientEvent(Engine& engine, SharedPtrunregister_client(_uri)) _responder->respond_ok(); diff --git a/src/engine/events/UnregisterClient.hpp b/src/engine/events/UnregisterClient.hpp index 8d313fb2..9b6f9ab1 100644 --- a/src/engine/events/UnregisterClient.hpp +++ b/src/engine/events/UnregisterClient.hpp @@ -29,10 +29,10 @@ namespace Events { * * \ingroup engine */ -class UnregisterClientEvent : public QueuedEvent +class UnregisterClient : public QueuedEvent { public: - UnregisterClientEvent(Engine& engine, + UnregisterClient(Engine& engine, SharedPtr responder, SampleCount timestamp, const Raul::URI& uri); -- cgit v1.2.1