From cf54391f7ca67774546380ef08f654d91a94c0cd Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 3 Jun 2009 01:40:54 +0000 Subject: Move internals to their own namespace ala events. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2071 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/InternalPlugin.cpp | 1 + src/engine/NodeFactory.cpp | 2 ++ src/engine/events/Note.cpp | 3 +++ src/engine/internals/Controller.cpp | 2 ++ src/engine/internals/Controller.hpp | 3 +++ src/engine/internals/Note.cpp | 2 ++ src/engine/internals/Note.hpp | 3 +++ src/engine/internals/Transport.cpp | 2 ++ src/engine/internals/Transport.hpp | 2 ++ src/engine/internals/Trigger.cpp | 2 ++ src/engine/internals/Trigger.hpp | 3 +++ 11 files changed, 25 insertions(+) diff --git a/src/engine/InternalPlugin.cpp b/src/engine/InternalPlugin.cpp index 77290c66..99061e6c 100644 --- a/src/engine/InternalPlugin.cpp +++ b/src/engine/InternalPlugin.cpp @@ -29,6 +29,7 @@ using namespace Raul; namespace Ingen { +using namespace Internals; InternalPlugin::InternalPlugin(const std::string& uri, const std::string& symbol) : PluginImpl(Plugin::Internal, uri) diff --git a/src/engine/NodeFactory.cpp b/src/engine/NodeFactory.cpp index f1df20b9..f9a468cc 100644 --- a/src/engine/NodeFactory.cpp +++ b/src/engine/NodeFactory.cpp @@ -46,6 +46,8 @@ using namespace std; namespace Ingen { +using namespace Internals; + NodeFactory::NodeFactory(Ingen::Shared::World* world) : _world(world) diff --git a/src/engine/events/Note.cpp b/src/engine/events/Note.cpp index 0871b0d3..e5a2370a 100644 --- a/src/engine/events/Note.cpp +++ b/src/engine/events/Note.cpp @@ -29,6 +29,9 @@ using namespace Raul; namespace Ingen { + +using namespace Internals; + namespace Events { diff --git a/src/engine/internals/Controller.cpp b/src/engine/internals/Controller.cpp index d615830a..70d1e7a9 100644 --- a/src/engine/internals/Controller.cpp +++ b/src/engine/internals/Controller.cpp @@ -32,6 +32,7 @@ using namespace std; namespace Ingen { +namespace Internals { using namespace Shared; @@ -138,4 +139,5 @@ ControllerNode::control(ProcessContext& context, uint8_t control_num, uint8_t va } // namespace Ingen +} // namespace Internals diff --git a/src/engine/internals/Controller.hpp b/src/engine/internals/Controller.hpp index e0c7de0f..4f02a9ca 100644 --- a/src/engine/internals/Controller.hpp +++ b/src/engine/internals/Controller.hpp @@ -26,6 +26,8 @@ namespace Ingen { class InputPort; class OutputPort; +namespace Internals { + /** MIDI control input node. * @@ -58,5 +60,6 @@ private: } // namespace Ingen +} // namespace Internals #endif // MIDICONTROLNODE_H diff --git a/src/engine/internals/Note.cpp b/src/engine/internals/Note.cpp index e3ba42d3..4b42807b 100644 --- a/src/engine/internals/Note.cpp +++ b/src/engine/internals/Note.cpp @@ -34,6 +34,7 @@ using namespace std; namespace Ingen { +namespace Internals { using namespace Shared; @@ -389,4 +390,5 @@ NoteNode::sustain_off(ProcessContext& context, FrameTime time) } // namespace Ingen +} // namespace Internals diff --git a/src/engine/internals/Note.hpp b/src/engine/internals/Note.hpp index b14ba604..d4c4c851 100644 --- a/src/engine/internals/Note.hpp +++ b/src/engine/internals/Note.hpp @@ -27,6 +27,8 @@ namespace Ingen { class InputPort; class OutputPort; +namespace Internals { + /** MIDI note input node. * @@ -84,5 +86,6 @@ private: } // namespace Ingen +} // namespace Internals #endif // MIDINOTENODE_H diff --git a/src/engine/internals/Transport.cpp b/src/engine/internals/Transport.cpp index 3355f4d8..8fccc436 100644 --- a/src/engine/internals/Transport.cpp +++ b/src/engine/internals/Transport.cpp @@ -27,6 +27,7 @@ using namespace std; namespace Ingen { +namespace Internals { static InternalPlugin transport_plugin(NS_INTERNALS "Transport", "transport"); @@ -153,4 +154,5 @@ TransportNode::process(ProcessContext& context) } // namespace Ingen +} // namespace Internals diff --git a/src/engine/internals/Transport.hpp b/src/engine/internals/Transport.hpp index 3947b235..78e12f4f 100644 --- a/src/engine/internals/Transport.hpp +++ b/src/engine/internals/Transport.hpp @@ -23,6 +23,7 @@ #include "NodeBase.hpp" namespace Ingen { +namespace Internals { /** Transport Node, brings timing information into patches. @@ -41,5 +42,6 @@ public: } // namespace Ingen +} // namespace Internals #endif // TRANSPORTNODE_H diff --git a/src/engine/internals/Trigger.cpp b/src/engine/internals/Trigger.cpp index cb7ae2fe..d30873c9 100644 --- a/src/engine/internals/Trigger.cpp +++ b/src/engine/internals/Trigger.cpp @@ -29,6 +29,7 @@ using namespace std; namespace Ingen { +namespace Internals { using namespace Shared; @@ -149,4 +150,5 @@ TriggerNode::note_off(ProcessContext& context, uint8_t note_num, FrameTime time) } // namespace Ingen +} // namespace Internals diff --git a/src/engine/internals/Trigger.hpp b/src/engine/internals/Trigger.hpp index 973b9b41..dfb4f899 100644 --- a/src/engine/internals/Trigger.hpp +++ b/src/engine/internals/Trigger.hpp @@ -26,6 +26,8 @@ namespace Ingen { class InputPort; class OutputPort; +namespace Internals { + /** MIDI trigger input node. * @@ -61,5 +63,6 @@ private: } // namespace Ingen +} // namespace Internals #endif // MIDITRIGGERNODE_H -- cgit v1.2.1