summaryrefslogtreecommitdiffstats
path: root/src/server/mix.cpp
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.cpp
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.cpp')
-rw-r--r--src/server/mix.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/mix.cpp b/src/server/mix.cpp
index e1e03063..be1a9f9f 100644
--- a/src/server/mix.cpp
+++ b/src/server/mix.cpp
@@ -16,7 +16,7 @@
#include "lv2/lv2plug.in/ns/ext/atom/util.h"
-#include "ingen/shared/URIs.hpp"
+#include "ingen/URIs.hpp"
#include "raul/log.hpp"
#include "AudioBuffer.hpp"
@@ -53,7 +53,7 @@ audio_accumulate(Context& context, AudioBuffer* dst, const AudioBuffer* src)
}
static inline bool
-is_audio(Shared::URIs& uris, LV2_URID type)
+is_audio(URIs& uris, LV2_URID type)
{
return type == uris.atom_Float || type == uris.atom_Sound;
}
@@ -69,7 +69,7 @@ is_end(const Buffer* buf, LV2_Atom_Event* ev)
void
mix(Context& context,
- Shared::URIs& uris,
+ URIs& uris,
Buffer* dst,
const Buffer*const* srcs,
uint32_t num_srcs)