summaryrefslogtreecommitdiffstats
path: root/src/server/mix.hpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-07-31 00:14:50 +0000
committerDavid Robillard <d@drobilla.net>2012-07-31 00:14:50 +0000
commit629fb50716083c71146340de97eb8651679ca9fb (patch)
tree9c5f25fdfd24f3cdb89924062f291a6647580878 /src/server/mix.hpp
parent6297b8805c95dd1831ee9a0b9639ae41d00a1473 (diff)
downloadingen-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/mix.hpp')
-rw-r--r--src/server/mix.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/mix.hpp b/src/server/mix.hpp
index 65dd8de2..320019a0 100644
--- a/src/server/mix.hpp
+++ b/src/server/mix.hpp
@@ -21,7 +21,7 @@
namespace Ingen {
-namespace Shared { class URIs; }
+class URIs;
namespace Server {
@@ -30,7 +30,7 @@ class Buffer;
void
mix(Context& context,
- Shared::URIs& uris,
+ URIs& uris,
Buffer* dst,
const Buffer*const* srcs,
uint32_t num_srcs);