diff options
51 files changed, 150 insertions, 29 deletions
diff --git a/src/engine/PortImpl.cpp b/src/engine/PortImpl.cpp index 64dbf511..f88a5bc2 100644 --- a/src/engine/PortImpl.cpp +++ b/src/engine/PortImpl.cpp @@ -180,13 +180,13 @@ PortImpl::broadcast_value(ProcessContext& context, bool force) if (_type == DataType::CONTROL || _type == DataType::AUDIO) { const Sample value = ((AudioBuffer*)buffer(0))->value_at(0); if (force || value != _last_broadcasted_value) { - const SendPortValueEvent ev(context.engine(), context.start(), this, false, 0, value); + const Events::SendPortValueEvent ev(context.engine(), context.start(), this, false, 0, value); context.event_sink().write(sizeof(ev), &ev); _last_broadcasted_value = value; } } else if (_type == DataType::EVENT) { if (((EventBuffer*)buffer(0))->event_count() > 0) { - const SendPortActivityEvent ev(context.engine(), context.start(), this); + const Events::SendPortActivityEvent ev(context.engine(), context.start(), this); context.event_sink().write(sizeof(ev), &ev); } } diff --git a/src/engine/PostProcessor.cpp b/src/engine/PostProcessor.cpp index 5b16d6c6..0566cc49 100644 --- a/src/engine/PostProcessor.cpp +++ b/src/engine/PostProcessor.cpp @@ -35,7 +35,7 @@ PostProcessor::PostProcessor(Engine& engine, size_t queue_size) : _engine(engine) , _max_time(0) , _events(queue_size) - , _event_buffer_size(sizeof(SendPortValueEvent)) // FIXME: make generic + , _event_buffer_size(sizeof(Events::SendPortValueEvent)) // FIXME: make generic , _event_buffer((uint8_t*)malloc(_event_buffer_size)) { } diff --git a/src/engine/QueuedEngineInterface.cpp b/src/engine/QueuedEngineInterface.cpp index 4873f21b..0627bf93 100644 --- a/src/engine/QueuedEngineInterface.cpp +++ b/src/engine/QueuedEngineInterface.cpp @@ -73,7 +73,7 @@ QueuedEngineInterface::disable_responses() void QueuedEngineInterface::register_client(ClientInterface* client) { - push_queued(new RegisterClientEvent(_engine, _responder, now(), client->uri(), client)); + push_queued(new Events::RegisterClientEvent(_engine, _responder, now(), client->uri(), client)); if (!_responder) { _responder = SharedPtr<Responder>(new Responder(client, 1)); } else { @@ -86,7 +86,7 @@ QueuedEngineInterface::register_client(ClientInterface* client) void QueuedEngineInterface::unregister_client(const URI& uri) { - push_queued(new UnregisterClientEvent(_engine, _responder, now(), uri)); + push_queued(new Events::UnregisterClientEvent(_engine, _responder, now(), uri)); if (_responder && _responder->client() && _responder->client()->uri() == uri) { _responder->set_id(0); _responder->set_client(NULL); @@ -99,7 +99,7 @@ QueuedEngineInterface::unregister_client(const URI& uri) void QueuedEngineInterface::load_plugins() { - push_queued(new LoadPluginsEvent(_engine, _responder, now(), this)); + push_queued(new Events::LoadPluginsEvent(_engine, _responder, now(), this)); } @@ -112,7 +112,7 @@ QueuedEngineInterface::activate() _engine.activate(1); } QueuedEventSource::activate_source(); - push_queued(new PingQueuedEvent(_engine, _responder, now())); + push_queued(new Events::PingQueuedEvent(_engine, _responder, now())); in_activate = false; } @@ -120,7 +120,7 @@ QueuedEngineInterface::activate() void QueuedEngineInterface::deactivate() { - push_queued(new DeactivateEvent(_engine, _responder, now())); + push_queued(new Events::DeactivateEvent(_engine, _responder, now())); } @@ -164,7 +164,7 @@ QueuedEngineInterface::put(const URI& uri, cerr << "\t" << i->first << " = " << i->second << " :: " << i->second.type() << endl; cerr << "}" << endl;*/ - push_queued(new SetMetadataEvent(_engine, _responder, now(), this, meta, subject, properties)); + push_queued(new Events::SetMetadataEvent(_engine, _responder, now(), this, meta, subject, properties)); } @@ -172,21 +172,21 @@ void QueuedEngineInterface::move(const Path& old_path, const Path& new_path) { - push_queued(new MoveEvent(_engine, _responder, now(), old_path, new_path)); + push_queued(new Events::MoveEvent(_engine, _responder, now(), old_path, new_path)); } void QueuedEngineInterface::del(const Path& path) { - push_queued(new DeleteEvent(_engine, _responder, now(), this, path)); + push_queued(new Events::DeleteEvent(_engine, _responder, now(), this, path)); } void QueuedEngineInterface::clear_patch(const Path& patch_path) { - push_queued(new ClearPatchEvent(_engine, _responder, now(), this, patch_path)); + push_queued(new Events::ClearPatchEvent(_engine, _responder, now(), this, patch_path)); } @@ -194,7 +194,7 @@ void QueuedEngineInterface::connect(const Path& src_port_path, const Path& dst_port_path) { - push_queued(new ConnectionEvent(_engine, _responder, now(), src_port_path, dst_port_path)); + push_queued(new Events::ConnectionEvent(_engine, _responder, now(), src_port_path, dst_port_path)); } @@ -203,7 +203,7 @@ void QueuedEngineInterface::disconnect(const Path& src_port_path, const Path& dst_port_path) { - push_queued(new DisconnectionEvent(_engine, _responder, now(), src_port_path, dst_port_path)); + push_queued(new Events::DisconnectionEvent(_engine, _responder, now(), src_port_path, dst_port_path)); } @@ -211,7 +211,7 @@ void QueuedEngineInterface::disconnect_all(const Path& patch_path, const Path& path) { - push_queued(new DisconnectAllEvent(_engine, _responder, now(), patch_path, path)); + push_queued(new Events::DisconnectAllEvent(_engine, _responder, now(), patch_path, path)); } @@ -219,7 +219,7 @@ void QueuedEngineInterface::set_port_value(const Path& port_path, const Raul::Atom& value) { - push_queued(new SetPortValueEvent(_engine, _responder, true, now(), port_path, value)); + push_queued(new Events::SetPortValueEvent(_engine, _responder, true, now(), port_path, value)); } @@ -228,14 +228,14 @@ QueuedEngineInterface::set_voice_value(const Path& port_path, uint32_t voice, const Raul::Atom& value) { - push_queued(new SetPortValueEvent(_engine, _responder, true, now(), voice, port_path, value)); + push_queued(new Events::SetPortValueEvent(_engine, _responder, true, now(), voice, port_path, value)); } void QueuedEngineInterface::midi_learn(const Path& node_path) { - push_queued(new MidiLearnEvent(_engine, _responder, now(), node_path)); + push_queued(new Events::MidiLearnEvent(_engine, _responder, now(), node_path)); } @@ -249,7 +249,7 @@ QueuedEngineInterface::set_property(const URI& uri, Path path = meta ? (string("/") + path.chop_start("/")) : uri.str(); Resource::Properties properties; properties.insert(make_pair(predicate, value)); - push_queued(new SetMetadataEvent(_engine, _responder, now(), this, meta, path, properties)); + push_queued(new Events::SetMetadataEvent(_engine, _responder, now(), this, meta, path, properties)); } // Requests // @@ -258,7 +258,7 @@ void QueuedEngineInterface::ping() { if (_engine.activated()) { - push_queued(new PingQueuedEvent(_engine, _responder, now())); + push_queued(new Events::PingQueuedEvent(_engine, _responder, now())); } else if (_responder) { _responder->respond_ok(); } @@ -268,7 +268,7 @@ QueuedEngineInterface::ping() void QueuedEngineInterface::get(const URI& uri) { - push_queued(new GetEvent(_engine, _responder, now(), uri)); + push_queued(new Events::GetEvent(_engine, _responder, now(), uri)); } @@ -279,23 +279,23 @@ QueuedEngineInterface::request_property(const URI& uri, const URI& key) bool meta = (hash != string::npos); const string path_str = string("/") + uri.chop_start("/"); if (meta && Path::is_valid(path_str)) - push_queued(new RequestMetadataEvent(_engine, _responder, now(), meta, path_str, key)); + push_queued(new Events::RequestMetadataEvent(_engine, _responder, now(), meta, path_str, key)); else - push_queued(new RequestMetadataEvent(_engine, _responder, now(), meta, uri, key)); + push_queued(new Events::RequestMetadataEvent(_engine, _responder, now(), meta, uri, key)); } void QueuedEngineInterface::request_plugins() { - push_queued(new RequestPluginsEvent(_engine, _responder, now())); + push_queued(new Events::RequestPluginsEvent(_engine, _responder, now())); } void QueuedEngineInterface::request_all_objects() { - push_queued(new RequestAllObjectsEvent(_engine, _responder, now())); + push_queued(new Events::RequestAllObjectsEvent(_engine, _responder, now())); } diff --git a/src/engine/events/AllNotesOff.cpp b/src/engine/events/AllNotesOff.cpp index 415e1a95..fa6c70e3 100644 --- a/src/engine/events/AllNotesOff.cpp +++ b/src/engine/events/AllNotesOff.cpp @@ -25,6 +25,7 @@ using namespace Raul; namespace Ingen { +namespace Events { /** Note off with patch explicitly passed - triggered by MIDI. @@ -69,5 +70,6 @@ AllNotesOffEvent::post_process() } // namespace Ingen +} // namespace Events diff --git a/src/engine/events/AllNotesOff.hpp b/src/engine/events/AllNotesOff.hpp index a7c5d58b..32e677bf 100644 --- a/src/engine/events/AllNotesOff.hpp +++ b/src/engine/events/AllNotesOff.hpp @@ -24,6 +24,8 @@ namespace Ingen { class PatchImpl; +namespace Events { + /** A note off event for all active voices. * @@ -45,5 +47,6 @@ private: } // namespace Ingen +} // namespace Events #endif // ALLNOTESOFFEVENT_H diff --git a/src/engine/events/ClearPatch.cpp b/src/engine/events/ClearPatch.cpp index 434360a7..084b78c9 100644 --- a/src/engine/events/ClearPatch.cpp +++ b/src/engine/events/ClearPatch.cpp @@ -34,6 +34,7 @@ using namespace std; using namespace Raul; namespace Ingen { +namespace Events { using namespace Shared; @@ -176,4 +177,5 @@ ClearPatchEvent::post_process() } // namespace Ingen +} // namespace Events diff --git a/src/engine/events/ClearPatch.hpp b/src/engine/events/ClearPatch.hpp index 4dc7dddb..fbfb6e1a 100644 --- a/src/engine/events/ClearPatch.hpp +++ b/src/engine/events/ClearPatch.hpp @@ -30,6 +30,8 @@ namespace Ingen { class PatchImpl; class DriverPort; +namespace Events { + /** Delete all nodes from a patch. * @@ -59,6 +61,7 @@ private: } // namespace Ingen +} // namespace Events #endif // CLEARPATCHEVENT_H diff --git a/src/engine/events/Connect.cpp b/src/engine/events/Connect.cpp index d6da9067..dbfb56ba 100644 --- a/src/engine/events/Connect.cpp +++ b/src/engine/events/Connect.cpp @@ -35,6 +35,7 @@ using namespace std; using namespace Raul; namespace Ingen { +namespace Events { using namespace Shared; @@ -201,4 +202,5 @@ ConnectionEvent::post_process() } // namespace Ingen +} // namespace Events diff --git a/src/engine/events/Connect.hpp b/src/engine/events/Connect.hpp index b1f4bf6c..0f9d8540 100644 --- a/src/engine/events/Connect.hpp +++ b/src/engine/events/Connect.hpp @@ -40,6 +40,8 @@ class InputPort; class OutputPort; class CompiledPatch; +namespace Events { + /** Make a Connection between two Ports. * @@ -86,5 +88,6 @@ private: } // namespace Ingen +} // namespace Events #endif // CONNECTIONEVENT_H diff --git a/src/engine/events/CreateNode.cpp b/src/engine/events/CreateNode.cpp index 28b50258..372f1bcb 100644 --- a/src/engine/events/CreateNode.cpp +++ b/src/engine/events/CreateNode.cpp @@ -37,6 +37,7 @@ using namespace std; using namespace Raul; namespace Ingen { +namespace Events { using namespace Shared; @@ -145,4 +146,5 @@ CreateNodeEvent::post_process() } // namespace Ingen +} // namespace Events diff --git a/src/engine/events/CreateNode.hpp b/src/engine/events/CreateNode.hpp index b8dbf082..560f7646 100644 --- a/src/engine/events/CreateNode.hpp +++ b/src/engine/events/CreateNode.hpp @@ -28,6 +28,8 @@ class PatchImpl; class NodeImpl; class CompiledPatch; +namespace Events { + /** An event to load a Node and insert it into a Patch. * @@ -66,5 +68,6 @@ private: } // namespace Ingen +} // namespace Events #endif // CREATENODEEVENT_H diff --git a/src/engine/events/CreatePatch.cpp b/src/engine/events/CreatePatch.cpp index de7cefd3..c527937a 100644 --- a/src/engine/events/CreatePatch.cpp +++ b/src/engine/events/CreatePatch.cpp @@ -31,6 +31,7 @@ using namespace std; using namespace Raul; namespace Ingen { +namespace Events { using namespace Shared; @@ -161,4 +162,5 @@ CreatePatchEvent::post_process() } // namespace Ingen +} // namespace Events diff --git a/src/engine/events/CreatePatch.hpp b/src/engine/events/CreatePatch.hpp index 44b47d8c..3aa400bc 100644 --- a/src/engine/events/CreatePatch.hpp +++ b/src/engine/events/CreatePatch.hpp @@ -26,6 +26,8 @@ namespace Ingen { class PatchImpl; class CompiledPatch; +namespace Events { + /** Creates a new Patch. * @@ -61,6 +63,7 @@ private: } // namespace Ingen +} // namespace Events #endif // CREATEPATCHEVENT_H diff --git a/src/engine/events/CreatePort.cpp b/src/engine/events/CreatePort.cpp index e12cdea2..5fb6d64d 100644 --- a/src/engine/events/CreatePort.cpp +++ b/src/engine/events/CreatePort.cpp @@ -39,6 +39,7 @@ using namespace std; using namespace Raul; namespace Ingen { +namespace Events { using namespace Shared; @@ -178,4 +179,5 @@ CreatePortEvent::post_process() } // namespace Ingen +} // namespace Events diff --git a/src/engine/events/CreatePort.hpp b/src/engine/events/CreatePort.hpp index ab65eabd..13cccfa6 100644 --- a/src/engine/events/CreatePort.hpp +++ b/src/engine/events/CreatePort.hpp @@ -30,6 +30,8 @@ class PatchImpl; class PortImpl; class DriverPort; +namespace Events { + /** An event to add a Port to a Patch. * @@ -76,5 +78,6 @@ private: } // namespace Ingen +} // namespace Events #endif // CREATEPORTEVENT_H diff --git a/src/engine/events/Deactivate.hpp b/src/engine/events/Deactivate.hpp index 57f09b28..c60b40b0 100644 --- a/src/engine/events/Deactivate.hpp +++ b/src/engine/events/Deactivate.hpp @@ -22,6 +22,7 @@ #include "Engine.hpp" namespace Ingen { +namespace Events { /** Deactivates the engine. @@ -43,5 +44,6 @@ public: } // namespace Ingen +} // namespace Events #endif // DEACTIVATEEVENT_H diff --git a/src/engine/events/Delete.cpp b/src/engine/events/Delete.cpp index 54e5626e..259fbcc6 100644 --- a/src/engine/events/Delete.cpp +++ b/src/engine/events/Delete.cpp @@ -34,6 +34,7 @@ using namespace std; namespace Ingen { +namespace Events { using namespace Shared; @@ -211,3 +212,4 @@ DeleteEvent::post_process() } // namespace Ingen +} // namespace Events diff --git a/src/engine/events/Delete.hpp b/src/engine/events/Delete.hpp index abaf9cdd..d5dc86da 100644 --- a/src/engine/events/Delete.hpp +++ b/src/engine/events/Delete.hpp @@ -33,9 +33,13 @@ class GraphObjectImpl; class NodeImpl; class PortImpl; class DriverPort; -class DisconnectAllEvent; class CompiledPatch; +namespace Events { + +class DisconnectAllEvent; + + /** \page methods * <h2>DELETE</h2> * As per WebDAV (RFC4918 S9.6). @@ -83,5 +87,6 @@ private: } // namespace Ingen +} // namespace Events #endif // DESTROYEVENT_H diff --git a/src/engine/events/Disconnect.cpp b/src/engine/events/Disconnect.cpp index e6d9b53d..6760b8d1 100644 --- a/src/engine/events/Disconnect.cpp +++ b/src/engine/events/Disconnect.cpp @@ -31,6 +31,7 @@ using namespace std; namespace Ingen { +namespace Events { //// DisconnectionEvent //// @@ -209,4 +210,5 @@ DisconnectionEvent::post_process() } // namespace Ingen +} // namespace Events diff --git a/src/engine/events/Disconnect.hpp b/src/engine/events/Disconnect.hpp index 24766462..d5b8b823 100644 --- a/src/engine/events/Disconnect.hpp +++ b/src/engine/events/Disconnect.hpp @@ -38,6 +38,8 @@ class InputPort; class OutputPort; class CompiledPatch; +namespace Events { + /** Make a Connection between two Ports. * @@ -84,5 +86,6 @@ private: } // namespace Ingen +} // namespace Events #endif // DISCONNECTIONEVENT_H diff --git a/src/engine/events/DisconnectAll.cpp b/src/engine/events/DisconnectAll.cpp index 2ab96394..b4380f34 100644 --- a/src/engine/events/DisconnectAll.cpp +++ b/src/engine/events/DisconnectAll.cpp @@ -38,6 +38,7 @@ using namespace std; using namespace Raul; namespace Ingen { +namespace Events { DisconnectAllEvent::DisconnectAllEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, const Path& parent_path, const Path& node_path) @@ -183,4 +184,5 @@ DisconnectAllEvent::post_process() } // namespace Ingen +} // namespace Events diff --git a/src/engine/events/DisconnectAll.hpp b/src/engine/events/DisconnectAll.hpp index 66c639f1..de07b250 100644 --- a/src/engine/events/DisconnectAll.hpp +++ b/src/engine/events/DisconnectAll.hpp @@ -24,7 +24,6 @@ namespace Ingen { -class DisconnectionEvent; class PatchImpl; class NodeImpl; class Connection; @@ -32,6 +31,10 @@ class PortImpl; class InputPort; class OutputPort; +namespace Events { + +class DisconnectionEvent; + /** An event to disconnect all connections to a Node. * @@ -71,6 +74,7 @@ private: } // namespace Ingen +} // namespace Events #endif // DISCONNECTNODEEVENT_H diff --git a/src/engine/events/Get.cpp b/src/engine/events/Get.cpp index a5193004..06a3493b 100644 --- a/src/engine/events/Get.cpp +++ b/src/engine/events/Get.cpp @@ -30,6 +30,7 @@ using namespace Raul; namespace Ingen { +namespace Events { GetEvent::GetEvent( @@ -83,4 +84,5 @@ GetEvent::post_process() } // namespace Ingen +} // namespace Events diff --git a/src/engine/events/Get.hpp b/src/engine/events/Get.hpp index d2413043..e1ede451 100644 --- a/src/engine/events/Get.hpp +++ b/src/engine/events/Get.hpp @@ -26,6 +26,8 @@ namespace Ingen { class GraphObjectImpl; class PluginImpl; +namespace Events { + /** A request from a client to send an object. * @@ -52,5 +54,6 @@ private: } // namespace Ingen +} // namespace Events #endif // REQUESTOBJECTEVENT_H diff --git a/src/engine/events/LoadPlugins.cpp b/src/engine/events/LoadPlugins.cpp index 14c9c915..b9276954 100644 --- a/src/engine/events/LoadPlugins.cpp +++ b/src/engine/events/LoadPlugins.cpp @@ -23,6 +23,7 @@ #include "QueuedEventSource.hpp" namespace Ingen { +namespace Events { LoadPluginsEvent::LoadPluginsEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, QueuedEventSource* source) @@ -50,4 +51,5 @@ LoadPluginsEvent::post_process() } // namespace Ingen +} // namespace Events diff --git a/src/engine/events/LoadPlugins.hpp b/src/engine/events/LoadPlugins.hpp index cf134aea..646acb45 100644 --- a/src/engine/events/LoadPlugins.hpp +++ b/src/engine/events/LoadPlugins.hpp @@ -21,6 +21,7 @@ #include "QueuedEvent.hpp" namespace Ingen { +namespace Events { /** Loads all plugins into the internal plugin database (in NodeFactory). @@ -41,5 +42,6 @@ public: } // namespace Ingen +} // namespace Events #endif // LOADPLUGINSEVENT_H diff --git a/src/engine/events/MidiLearn.cpp b/src/engine/events/MidiLearn.cpp index 8a06508a..00ea4f75 100644 --- a/src/engine/events/MidiLearn.cpp +++ b/src/engine/events/MidiLearn.cpp @@ -27,6 +27,7 @@ using namespace std; namespace Ingen { +namespace Events { MidiLearnEvent::MidiLearnEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, const Raul::Path& node_path) @@ -79,5 +80,6 @@ MidiLearnEvent::post_process() } // namespace Ingen +} // namespace Events diff --git a/src/engine/events/MidiLearn.hpp b/src/engine/events/MidiLearn.hpp index e718cd00..3b13c896 100644 --- a/src/engine/events/MidiLearn.hpp +++ b/src/engine/events/MidiLearn.hpp @@ -25,7 +25,8 @@ namespace Ingen { class NodeImpl; -class ControlChangeEvent; + +namespace Events { /** A MIDI learn event (used by control node to learn controller number). @@ -54,5 +55,6 @@ private: } // namespace Ingen +} // namespace Events #endif // MIDILEARNEVENT_H diff --git a/src/engine/events/Move.cpp b/src/engine/events/Move.cpp index cb439a3f..f90bf244 100644 --- a/src/engine/events/Move.cpp +++ b/src/engine/events/Move.cpp @@ -30,6 +30,7 @@ using namespace std; using namespace Raul; namespace Ingen { +namespace Events { using namespace Shared; @@ -140,3 +141,4 @@ MoveEvent::post_process() } // namespace Ingen +} // namespace Events diff --git a/src/engine/events/Move.hpp b/src/engine/events/Move.hpp index 06b410fb..5ef81c93 100644 --- a/src/engine/events/Move.hpp +++ b/src/engine/events/Move.hpp @@ -26,6 +26,9 @@ namespace Ingen { class PatchImpl; +namespace Events { + + /** \page methods * <h2>MOVE</h2> * As per WebDAV (RFC4918 S9.9). @@ -72,5 +75,6 @@ private: } // namespace Ingen +} // namespace Events #endif // RENAMEEVENT_H diff --git a/src/engine/events/Note.cpp b/src/engine/events/Note.cpp index 79ebcb10..b6ad7a2a 100644 --- a/src/engine/events/Note.cpp +++ b/src/engine/events/Note.cpp @@ -29,6 +29,7 @@ using namespace Raul; namespace Ingen { +namespace Events { /** Note on with Patch explicitly passed. @@ -101,4 +102,5 @@ NoteEvent::post_process() } // namespace Ingen +} // namespace Events diff --git a/src/engine/events/Note.hpp b/src/engine/events/Note.hpp index eba0ff6b..bb9d7989 100644 --- a/src/engine/events/Note.hpp +++ b/src/engine/events/Note.hpp @@ -25,6 +25,8 @@ namespace Ingen { class NodeImpl; +namespace Events { + /** A note on event. * @@ -62,5 +64,6 @@ private: } // namespace Ingen +} // namespace Events #endif // NOTEEVENT_H diff --git a/src/engine/events/Ping.hpp b/src/engine/events/Ping.hpp index 108948a0..cfb574ac 100644 --- a/src/engine/events/Ping.hpp +++ b/src/engine/events/Ping.hpp @@ -26,6 +26,8 @@ namespace Ingen { class PortImpl; +namespace Events { + /** A ping that travels through the pre-processed event queue before responding * (useful for the order guarantee). @@ -44,5 +46,6 @@ public: } // namespace Ingen +} // namespace Events #endif // PINGQUEUEDEVENT_H diff --git a/src/engine/events/RegisterClient.cpp b/src/engine/events/RegisterClient.cpp index dab1c739..701075be 100644 --- a/src/engine/events/RegisterClient.cpp +++ b/src/engine/events/RegisterClient.cpp @@ -23,6 +23,7 @@ using namespace Raul; namespace Ingen { +namespace Events { RegisterClientEvent::RegisterClientEvent(Engine& engine, @@ -54,4 +55,5 @@ RegisterClientEvent::post_process() } // namespace Ingen +} // namespace Events diff --git a/src/engine/events/RegisterClient.hpp b/src/engine/events/RegisterClient.hpp index 6016d949..d72c1d5a 100644 --- a/src/engine/events/RegisterClient.hpp +++ b/src/engine/events/RegisterClient.hpp @@ -23,6 +23,7 @@ #include "QueuedEvent.hpp" namespace Ingen { +namespace Events { /** Registers a new client with the OSC system, so it can receive updates. @@ -48,5 +49,6 @@ private: } // namespace Ingen +} // namespace Events #endif // REGISTERCLIENTEVENT_H diff --git a/src/engine/events/RequestAllObjects.cpp b/src/engine/events/RequestAllObjects.cpp index 986cbb0c..998566a4 100644 --- a/src/engine/events/RequestAllObjects.cpp +++ b/src/engine/events/RequestAllObjects.cpp @@ -24,6 +24,7 @@ #include "PatchImpl.hpp" namespace Ingen { +namespace Events { RequestAllObjectsEvent::RequestAllObjectsEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp) @@ -57,4 +58,5 @@ RequestAllObjectsEvent::post_process() } // namespace Ingen +} // namespace Events diff --git a/src/engine/events/RequestAllObjects.hpp b/src/engine/events/RequestAllObjects.hpp index c473512c..260c70ac 100644 --- a/src/engine/events/RequestAllObjects.hpp +++ b/src/engine/events/RequestAllObjects.hpp @@ -21,6 +21,7 @@ #include "QueuedEvent.hpp" namespace Ingen { +namespace Events { /** A request from a client to send notification of all objects (ie refresh). @@ -38,5 +39,6 @@ public: } // namespace Ingen +} // namespace Events #endif // REQUESTALLOBJECTSEVENT_H diff --git a/src/engine/events/RequestMetadata.cpp b/src/engine/events/RequestMetadata.cpp index 26400fef..8ffcb513 100644 --- a/src/engine/events/RequestMetadata.cpp +++ b/src/engine/events/RequestMetadata.cpp @@ -30,6 +30,7 @@ using namespace std; using namespace Raul; namespace Ingen { +namespace Events { using namespace Shared; @@ -125,4 +126,5 @@ RequestMetadataEvent::post_process() } // namespace Ingen +} // namespace Events diff --git a/src/engine/events/RequestMetadata.hpp b/src/engine/events/RequestMetadata.hpp index ead39a50..23a528b7 100644 --- a/src/engine/events/RequestMetadata.hpp +++ b/src/engine/events/RequestMetadata.hpp @@ -25,9 +25,11 @@ namespace Ingen { namespace Shared { class ResourceImpl; } - class GraphObjectImpl; +namespace Events { + + /** \page methods * <h2>GET</h2> * As per HTTP (RFC2616 S9.3). @@ -69,5 +71,6 @@ private: } // namespace Ingen +} // namespace Events #endif // REQUESTMETADATAEVENT_H diff --git a/src/engine/events/RequestPlugins.cpp b/src/engine/events/RequestPlugins.cpp index 9daa24d1..b54888c3 100644 --- a/src/engine/events/RequestPlugins.cpp +++ b/src/engine/events/RequestPlugins.cpp @@ -22,6 +22,7 @@ #include "NodeFactory.hpp" namespace Ingen { +namespace Events { RequestPluginsEvent::RequestPluginsEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp) @@ -54,4 +55,5 @@ RequestPluginsEvent::post_process() } // namespace Ingen +} // namespace Events diff --git a/src/engine/events/RequestPlugins.hpp b/src/engine/events/RequestPlugins.hpp index d4f2d05a..8eb98492 100644 --- a/src/engine/events/RequestPlugins.hpp +++ b/src/engine/events/RequestPlugins.hpp @@ -25,6 +25,9 @@ namespace Ingen { class Responder; +namespace Events { + + /** A request from a client to send notification of all objects (ie refresh). * * \ingroup engine @@ -43,5 +46,6 @@ private: } // namespace Ingen +} // namespace Events #endif // REQUESTPLUGINSEVENT_H diff --git a/src/engine/events/SendPortActivity.cpp b/src/engine/events/SendPortActivity.cpp index 9dc26365..580f347f 100644 --- a/src/engine/events/SendPortActivity.cpp +++ b/src/engine/events/SendPortActivity.cpp @@ -21,6 +21,7 @@ #include "ClientBroadcaster.hpp" namespace Ingen { +namespace Events { void @@ -31,4 +32,5 @@ SendPortActivityEvent::post_process() } // namespace Ingen +} // namespace Events diff --git a/src/engine/events/SendPortActivity.hpp b/src/engine/events/SendPortActivity.hpp index 45a4cd36..bc2cb21f 100644 --- a/src/engine/events/SendPortActivity.hpp +++ b/src/engine/events/SendPortActivity.hpp @@ -25,6 +25,8 @@ namespace Ingen { class PortImpl; +namespace Events { + /** A special event used internally to send port activity notification (e.g. * MIDI event activity) from the audio thread. @@ -61,5 +63,6 @@ private: } // namespace Ingen +} // namespace Events #endif // SENDPORTACTIVITYEVENT_H diff --git a/src/engine/events/SendPortValue.cpp b/src/engine/events/SendPortValue.cpp index 56292bf0..170399a4 100644 --- a/src/engine/events/SendPortValue.cpp +++ b/src/engine/events/SendPortValue.cpp @@ -24,6 +24,7 @@ using namespace std; namespace Ingen { +namespace Events { void @@ -40,4 +41,5 @@ SendPortValueEvent::post_process() } // namespace Ingen +} // namespace Events diff --git a/src/engine/events/SendPortValue.hpp b/src/engine/events/SendPortValue.hpp index 87d42e7a..051070b7 100644 --- a/src/engine/events/SendPortValue.hpp +++ b/src/engine/events/SendPortValue.hpp @@ -25,6 +25,8 @@ namespace Ingen { class PortImpl; +namespace Events { + /** A special event used internally to send port values from the audio thread. * @@ -72,5 +74,6 @@ private: } // namespace Ingen +} // namespace Events #endif // SENDPORTVALUEEVENT_H diff --git a/src/engine/events/SetMetadata.cpp b/src/engine/events/SetMetadata.cpp index f722d3b2..ad0be1f9 100644 --- a/src/engine/events/SetMetadata.cpp +++ b/src/engine/events/SetMetadata.cpp @@ -36,6 +36,7 @@ using namespace std; using namespace Raul; namespace Ingen { +namespace Events { using namespace Shared; typedef Shared::Resource::Properties Properties; @@ -239,4 +240,5 @@ SetMetadataEvent::post_process() } // namespace Ingen +} // namespace Events diff --git a/src/engine/events/SetMetadata.hpp b/src/engine/events/SetMetadata.hpp index a3aadfa9..f9f375fc 100644 --- a/src/engine/events/SetMetadata.hpp +++ b/src/engine/events/SetMetadata.hpp @@ -30,6 +30,9 @@ class GraphObjectImpl; class PatchImpl; class CompiledPatch; +namespace Events { + + /** \page methods * <h2>POST</h2> * As per HTTP (RFC2616 S9.5). @@ -96,5 +99,6 @@ private: } // namespace Ingen +} // namespace Events #endif // SETMETADATAEVENT_H diff --git a/src/engine/events/SetPortValue.cpp b/src/engine/events/SetPortValue.cpp index 14892bcf..4078b7c2 100644 --- a/src/engine/events/SetPortValue.cpp +++ b/src/engine/events/SetPortValue.cpp @@ -36,6 +36,7 @@ using namespace std; using namespace Raul; namespace Ingen { +namespace Events { using namespace Shared; @@ -227,4 +228,5 @@ SetPortValueEvent::post_process() } // namespace Ingen +} // namespace Events diff --git a/src/engine/events/SetPortValue.hpp b/src/engine/events/SetPortValue.hpp index 31eb67de..701ab09f 100644 --- a/src/engine/events/SetPortValue.hpp +++ b/src/engine/events/SetPortValue.hpp @@ -26,6 +26,8 @@ namespace Ingen { class PortImpl; +namespace Events { + /** An event to change the value of a port. * @@ -82,5 +84,6 @@ private: } // namespace Ingen +} // namespace Events #endif // SETPORTVALUEEVENT_H diff --git a/src/engine/events/UnregisterClient.cpp b/src/engine/events/UnregisterClient.cpp index 9e0572d5..13bf2d47 100644 --- a/src/engine/events/UnregisterClient.cpp +++ b/src/engine/events/UnregisterClient.cpp @@ -24,6 +24,7 @@ using namespace Raul; namespace Ingen { +namespace Events { UnregisterClientEvent::UnregisterClientEvent(Engine& engine, SharedPtr<Responder> responder, SampleCount timestamp, const URI& uri) @@ -44,4 +45,5 @@ UnregisterClientEvent::post_process() } // namespace Ingen +} // namespace Events diff --git a/src/engine/events/UnregisterClient.hpp b/src/engine/events/UnregisterClient.hpp index d33ea554..8d313fb2 100644 --- a/src/engine/events/UnregisterClient.hpp +++ b/src/engine/events/UnregisterClient.hpp @@ -22,6 +22,7 @@ #include "raul/URI.hpp" namespace Ingen { +namespace Events { /** Unregisters an OSC client so it no longer receives notifications. @@ -44,5 +45,6 @@ private: } // namespace Ingen +} // namespace Events #endif // UNREGISTERCLIENTEVENT_H |