From 8ba6bb943889bfdd58cf4a971a152041c1199cfe Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 18 Apr 2011 12:47:15 +0000 Subject: Put engine code in new Ingen::Engine namespace. Put core interfaces in Ingen namespace (not Ingen::Shared). git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3159 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/internals/Controller.cpp | 6 +++--- src/engine/internals/Controller.hpp | 2 ++ src/engine/internals/Delay.cpp | 6 +++--- src/engine/internals/Delay.hpp | 2 ++ src/engine/internals/Note.cpp | 6 +++--- src/engine/internals/Note.hpp | 2 ++ src/engine/internals/Trigger.cpp | 6 +++--- src/engine/internals/Trigger.hpp | 2 ++ 8 files changed, 20 insertions(+), 12 deletions(-) (limited to 'src/engine/internals') diff --git a/src/engine/internals/Controller.cpp b/src/engine/internals/Controller.cpp index 7b27d664..15156f08 100644 --- a/src/engine/internals/Controller.cpp +++ b/src/engine/internals/Controller.cpp @@ -32,10 +32,9 @@ using namespace std; namespace Ingen { +namespace Engine { namespace Internals { -using namespace Shared; - InternalPlugin* ControllerNode::internal_plugin(Shared::LV2URIMap& uris) { return new InternalPlugin(uris, NS_INTERNALS "Controller", "controller"); } @@ -49,7 +48,7 @@ ControllerNode::ControllerNode(InternalPlugin* plugin, : NodeImpl(plugin, path, false, parent, srate) , _learning(false) { - const LV2URIMap& uris = bufs.uris(); + const Ingen::Shared::LV2URIMap& uris = bufs.uris(); _ports = new Raul::Array(6); _midi_in_port = new InputPort(bufs, this, "input", 0, 1, PortType::EVENTS, Raul::Atom()); @@ -143,5 +142,6 @@ ControllerNode::control(ProcessContext& context, uint8_t control_num, uint8_t va } } // namespace Internals +} // namespace Engine } // namespace Ingen diff --git a/src/engine/internals/Controller.hpp b/src/engine/internals/Controller.hpp index 1960b5e3..54b1d3ac 100644 --- a/src/engine/internals/Controller.hpp +++ b/src/engine/internals/Controller.hpp @@ -22,6 +22,7 @@ #include "NodeImpl.hpp" namespace Ingen { +namespace Engine { class InputPort; class OutputPort; @@ -66,6 +67,7 @@ private: OutputPort* _audio_port; }; +} // namespace Engine } // namespace Ingen } // namespace Internals diff --git a/src/engine/internals/Delay.cpp b/src/engine/internals/Delay.cpp index fb599acf..bded108a 100644 --- a/src/engine/internals/Delay.cpp +++ b/src/engine/internals/Delay.cpp @@ -43,10 +43,9 @@ using namespace std; using namespace Raul; namespace Ingen { +namespace Engine { namespace Internals { -using namespace Shared; - static const float MAX_DELAY_SECONDS = 8.0f; InternalPlugin* DelayNode::internal_plugin(Shared::LV2URIMap& uris) { @@ -66,7 +65,7 @@ DelayNode::DelayNode( , _buffer_mask(0) , _write_phase(0) { - const LV2URIMap& uris = bufs.uris(); + const Ingen::Shared::LV2URIMap& uris = bufs.uris(); _ports = new Raul::Array(3); const float default_delay = 1.0f; @@ -204,5 +203,6 @@ DelayNode::process(ProcessContext& context) } } // namespace Internals +} // namespace Engine } // namespace Ingen diff --git a/src/engine/internals/Delay.hpp b/src/engine/internals/Delay.hpp index 0f1ee66e..bc6f2682 100644 --- a/src/engine/internals/Delay.hpp +++ b/src/engine/internals/Delay.hpp @@ -24,6 +24,7 @@ #include "NodeImpl.hpp" namespace Ingen { +namespace Engine { class InputPort; class OutputPort; @@ -70,6 +71,7 @@ private: float _delay_samples; }; +} // namespace Engine } // namespace Ingen } // namespace Internals diff --git a/src/engine/internals/Note.cpp b/src/engine/internals/Note.cpp index 5ec294a1..8545857e 100644 --- a/src/engine/internals/Note.cpp +++ b/src/engine/internals/Note.cpp @@ -39,10 +39,9 @@ using namespace std; using namespace Raul; namespace Ingen { +namespace Engine { namespace Internals { -using namespace Shared; - InternalPlugin* NoteNode::internal_plugin(Shared::LV2URIMap& uris) { return new InternalPlugin(uris, NS_INTERNALS "Note", "note"); } @@ -59,7 +58,7 @@ NoteNode::NoteNode( , _prepared_voices(NULL) , _sustain(false) { - const LV2URIMap& uris = bufs.uris(); + const Ingen::Shared::LV2URIMap& uris = bufs.uris(); _ports = new Raul::Array(5); _midi_in_port = new InputPort(bufs, this, "input", 0, 1, PortType::EVENTS, Raul::Atom()); @@ -412,5 +411,6 @@ NoteNode::sustain_off(ProcessContext& context, FrameTime time) } } // namespace Internals +} // namespace Engine } // namespace Ingen diff --git a/src/engine/internals/Note.hpp b/src/engine/internals/Note.hpp index 7677b68d..7a47dc76 100644 --- a/src/engine/internals/Note.hpp +++ b/src/engine/internals/Note.hpp @@ -23,6 +23,7 @@ #include "NodeImpl.hpp" namespace Ingen { +namespace Engine { class InputPort; class OutputPort; @@ -93,6 +94,7 @@ private: OutputPort* _trig_port; }; +} // namespace Engine } // namespace Ingen } // namespace Internals diff --git a/src/engine/internals/Trigger.cpp b/src/engine/internals/Trigger.cpp index 2820afe3..55474618 100644 --- a/src/engine/internals/Trigger.cpp +++ b/src/engine/internals/Trigger.cpp @@ -35,10 +35,9 @@ using namespace std; using namespace Raul; namespace Ingen { +namespace Engine { namespace Internals { -using namespace Shared; - InternalPlugin* TriggerNode::internal_plugin(Shared::LV2URIMap& uris) { return new InternalPlugin(uris, NS_INTERNALS "Trigger", "trigger"); } @@ -53,7 +52,7 @@ TriggerNode::TriggerNode( : NodeImpl(plugin, path, false, parent, srate) , _learning(false) { - const LV2URIMap& uris = bufs.uris(); + const Ingen::Shared::LV2URIMap& uris = bufs.uris(); _ports = new Raul::Array(5); _midi_in_port = new InputPort(bufs, this, "input", 0, 1, PortType::EVENTS, Raul::Atom()); @@ -165,4 +164,5 @@ TriggerNode::note_off(ProcessContext& context, uint8_t note_num, FrameTime time) } } // namespace Internals +} // namespace Engine } // namespace Ingen diff --git a/src/engine/internals/Trigger.hpp b/src/engine/internals/Trigger.hpp index 53e83081..da796f5e 100644 --- a/src/engine/internals/Trigger.hpp +++ b/src/engine/internals/Trigger.hpp @@ -22,6 +22,7 @@ #include "NodeImpl.hpp" namespace Ingen { +namespace Engine { class InputPort; class OutputPort; @@ -69,6 +70,7 @@ private: OutputPort* _vel_port; }; +} // namespace Engine } // namespace Ingen } // namespace Internals -- cgit v1.2.1