From 629fb50716083c71146340de97eb8651679ca9fb Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 31 Jul 2012 00:14:50 +0000 Subject: Merge Ingen::Shared namespace into Ingen namespace and core libingen library. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4579 a436a847-0d15-0410-975c-d299462d15a1 --- src/server/internals/Controller.cpp | 6 +++--- src/server/internals/Controller.hpp | 2 +- src/server/internals/Delay.cpp | 6 +++--- src/server/internals/Delay.hpp | 2 +- src/server/internals/Note.cpp | 6 +++--- src/server/internals/Note.hpp | 2 +- src/server/internals/Trigger.cpp | 6 +++--- src/server/internals/Trigger.hpp | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/server/internals') diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp index 76183e85..85f69442 100644 --- a/src/server/internals/Controller.cpp +++ b/src/server/internals/Controller.cpp @@ -18,7 +18,7 @@ #include -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "internals/Controller.hpp" #include "lv2/lv2plug.in/ns/ext/atom/util.h" #include "raul/midi_events.h" @@ -38,7 +38,7 @@ namespace Ingen { namespace Server { namespace Internals { -InternalPlugin* ControllerNode::internal_plugin(Shared::URIs& uris) { +InternalPlugin* ControllerNode::internal_plugin(URIs& uris) { return new InternalPlugin(uris, NS_INTERNALS "Controller", "controller"); } @@ -51,7 +51,7 @@ ControllerNode::ControllerNode(InternalPlugin* plugin, : NodeImpl(plugin, path, false, parent, srate) , _learning(false) { - const Ingen::Shared::URIs& uris = bufs.uris(); + const Ingen::URIs& uris = bufs.uris(); _ports = new Raul::Array(6); _midi_in_port = new InputPort(bufs, this, "input", 0, 1, diff --git a/src/server/internals/Controller.hpp b/src/server/internals/Controller.hpp index 5672d8ab..e4717247 100644 --- a/src/server/internals/Controller.hpp +++ b/src/server/internals/Controller.hpp @@ -52,7 +52,7 @@ public: void learn() { _learning = true; } - static InternalPlugin* internal_plugin(Shared::URIs& uris); + static InternalPlugin* internal_plugin(URIs& uris); private: InputPort* _midi_in_port; diff --git a/src/server/internals/Delay.cpp b/src/server/internals/Delay.cpp index d7cbcfb9..9e7f0afd 100644 --- a/src/server/internals/Delay.cpp +++ b/src/server/internals/Delay.cpp @@ -19,7 +19,7 @@ #include #include -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "raul/Array.hpp" #include "raul/Maid.hpp" #include "raul/log.hpp" @@ -49,7 +49,7 @@ namespace Internals { static const float MAX_DELAY_SECONDS = 8.0f; -InternalPlugin* DelayNode::internal_plugin(Shared::URIs& uris) { +InternalPlugin* DelayNode::internal_plugin(URIs& uris) { return new InternalPlugin(uris, NS_INTERNALS "Delay", "delay"); } @@ -65,7 +65,7 @@ DelayNode::DelayNode(InternalPlugin* plugin, , _buffer_mask(0) , _write_phase(0) { - const Ingen::Shared::URIs& uris = bufs.uris(); + const Ingen::URIs& uris = bufs.uris(); _ports = new Raul::Array(3); const float default_delay = 1.0f; diff --git a/src/server/internals/Delay.hpp b/src/server/internals/Delay.hpp index e9695ecc..4609eaa0 100644 --- a/src/server/internals/Delay.hpp +++ b/src/server/internals/Delay.hpp @@ -48,7 +48,7 @@ public: void process(ProcessContext& context); - static InternalPlugin* internal_plugin(Shared::URIs& uris); + static InternalPlugin* internal_plugin(URIs& uris); float delay_samples() const { return _delay_samples; } diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp index 923b70c0..1292686d 100644 --- a/src/server/internals/Note.cpp +++ b/src/server/internals/Note.cpp @@ -17,7 +17,7 @@ #include #include -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "lv2/lv2plug.in/ns/ext/atom/util.h" #include "raul/Array.hpp" #include "raul/Maid.hpp" @@ -45,7 +45,7 @@ namespace Ingen { namespace Server { namespace Internals { -InternalPlugin* NoteNode::internal_plugin(Shared::URIs& uris) { +InternalPlugin* NoteNode::internal_plugin(URIs& uris) { return new InternalPlugin(uris, NS_INTERNALS "Note", "note"); } @@ -60,7 +60,7 @@ NoteNode::NoteNode(InternalPlugin* plugin, , _prepared_voices(NULL) , _sustain(false) { - const Ingen::Shared::URIs& uris = bufs.uris(); + const Ingen::URIs& uris = bufs.uris(); _ports = new Raul::Array(5); _midi_in_port = new InputPort(bufs, this, "input", 0, 1, diff --git a/src/server/internals/Note.hpp b/src/server/internals/Note.hpp index 591214ce..ed7fd6b0 100644 --- a/src/server/internals/Note.hpp +++ b/src/server/internals/Note.hpp @@ -60,7 +60,7 @@ public: void sustain_on(ProcessContext& context, FrameTime time); void sustain_off(ProcessContext& context, FrameTime time); - static InternalPlugin* internal_plugin(Shared::URIs& uris); + static InternalPlugin* internal_plugin(URIs& uris); private: /** Key, one for each key on the keyboard */ diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp index 36f80dd6..699c31f1 100644 --- a/src/server/internals/Trigger.cpp +++ b/src/server/internals/Trigger.cpp @@ -17,7 +17,7 @@ #include #include -#include "ingen/shared/URIs.hpp" +#include "ingen/URIs.hpp" #include "lv2/lv2plug.in/ns/ext/atom/util.h" #include "raul/log.hpp" #include "raul/midi_events.h" @@ -39,7 +39,7 @@ namespace Ingen { namespace Server { namespace Internals { -InternalPlugin* TriggerNode::internal_plugin(Shared::URIs& uris) { +InternalPlugin* TriggerNode::internal_plugin(URIs& uris) { return new InternalPlugin(uris, NS_INTERNALS "Trigger", "trigger"); } @@ -52,7 +52,7 @@ TriggerNode::TriggerNode(InternalPlugin* plugin, : NodeImpl(plugin, path, false, parent, srate) , _learning(false) { - const Ingen::Shared::URIs& uris = bufs.uris(); + const Ingen::URIs& uris = bufs.uris(); _ports = new Raul::Array(5); _midi_in_port = new InputPort(bufs, this, "input", 0, 1, diff --git a/src/server/internals/Trigger.hpp b/src/server/internals/Trigger.hpp index 5bbae82d..a9a561ee 100644 --- a/src/server/internals/Trigger.hpp +++ b/src/server/internals/Trigger.hpp @@ -56,7 +56,7 @@ public: void learn() { _learning = true; } - static InternalPlugin* internal_plugin(Shared::URIs& uris); + static InternalPlugin* internal_plugin(URIs& uris); private: bool _learning; -- cgit v1.2.1