summaryrefslogtreecommitdiffstats
path: root/src/server/mix.hpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-05-11 19:47:45 +0000
committerDavid Robillard <d@drobilla.net>2012-05-11 19:47:45 +0000
commit393c5e2ffe3c28ece6768c8c7a2c09d4226af477 (patch)
tree122d112210b092bc378278a33d414021ab837869 /src/server/mix.hpp
parent8ce8231c03b6ea32ef8d755503509aa72636aac7 (diff)
downloadingen-393c5e2ffe3c28ece6768c8c7a2c09d4226af477.tar.gz
ingen-393c5e2ffe3c28ece6768c8c7a2c09d4226af477.tar.bz2
ingen-393c5e2ffe3c28ece6768c8c7a2c09d4226af477.zip
Fix compilation with clang.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4358 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/mix.hpp')
-rw-r--r--src/server/mix.hpp20
1 files changed, 9 insertions, 11 deletions
diff --git a/src/server/mix.hpp b/src/server/mix.hpp
index 75214093..c68b0710 100644
--- a/src/server/mix.hpp
+++ b/src/server/mix.hpp
@@ -17,8 +17,6 @@
#ifndef INGEN_ENGINE_MIX_HPP
#define INGEN_ENGINE_MIX_HPP
-#include <boost/intrusive_ptr.hpp>
-
#include "ingen/shared/URIs.hpp"
#include "raul/log.hpp"
@@ -35,22 +33,22 @@ is_audio(Shared::URIs& uris, LV2_URID type)
}
inline void
-mix(Context& context,
- Shared::URIs& uris,
- Buffer* dst,
- const boost::intrusive_ptr<Buffer>* srcs,
- uint32_t num_srcs)
+mix(Context& context,
+ Shared::URIs& uris,
+ Buffer* dst,
+ Buffer** srcs,
+ uint32_t num_srcs)
{
if (num_srcs == 1) {
- dst->copy(context, srcs[0].get());
+ dst->copy(context, srcs[0]);
} else if (is_audio(uris, dst->type())) {
// Copy the first source
- dst->copy(context, srcs[0].get());
+ dst->copy(context, srcs[0]);
// Mix in the rest
for (uint32_t i = 1; i < num_srcs; ++i) {
assert(is_audio(uris, srcs[i]->type()));
- ((AudioBuffer*)dst)->accumulate(context, (AudioBuffer*)srcs[i].get());
+ ((AudioBuffer*)dst)->accumulate(context, (AudioBuffer*)srcs[i]);
}
} else {
std::cerr << "FIXME: event mix" << std::endl;
@@ -66,7 +64,7 @@ mix(Context& context,
while (true) {
const EventBuffer* first = NULL;
for (uint32_t i = 0; i < num_srcs; ++i) {
- const EventBuffer* const src = (const EventBuffer*)srcs[i].get();
+ const EventBuffer* const src = (const EventBuffer*)srcs[i];
if (src->is_valid()) {
if (!first || src->get_event()->frames < first->get_event()->frames)
first = src;