diff options
author | David Robillard <d@drobilla.net> | 2012-07-31 00:14:50 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2012-07-31 00:14:50 +0000 |
commit | 629fb50716083c71146340de97eb8651679ca9fb (patch) | |
tree | 9c5f25fdfd24f3cdb89924062f291a6647580878 /src/server/internals/Controller.cpp | |
parent | 6297b8805c95dd1831ee9a0b9639ae41d00a1473 (diff) | |
download | ingen-629fb50716083c71146340de97eb8651679ca9fb.tar.gz ingen-629fb50716083c71146340de97eb8651679ca9fb.tar.bz2 ingen-629fb50716083c71146340de97eb8651679ca9fb.zip |
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
Diffstat (limited to 'src/server/internals/Controller.cpp')
-rw-r--r-- | src/server/internals/Controller.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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 <string> -#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<PortImpl*>(6); _midi_in_port = new InputPort(bufs, this, "input", 0, 1, |