From 393c5e2ffe3c28ece6768c8c7a2c09d4226af477 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 11 May 2012 19:47:45 +0000 Subject: Fix compilation with clang. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4358 a436a847-0d15-0410-975c-d299462d15a1 --- src/server/EdgeImpl.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/server/EdgeImpl.cpp') diff --git a/src/server/EdgeImpl.cpp b/src/server/EdgeImpl.cpp index a5c63d4a..b783587d 100644 --- a/src/server/EdgeImpl.cpp +++ b/src/server/EdgeImpl.cpp @@ -15,7 +15,6 @@ */ #include -#include #include "ingen/shared/URIs.hpp" #include "lv2/lv2plug.in/ns/ext/atom/util.h" @@ -80,11 +79,11 @@ EdgeImpl::head_path() const } void -EdgeImpl::get_sources(Context& context, - uint32_t voice, - boost::intrusive_ptr* srcs, - uint32_t max_num_srcs, - uint32_t& num_srcs) +EdgeImpl::get_sources(Context& context, + uint32_t voice, + Buffer** srcs, + uint32_t max_num_srcs, + uint32_t& num_srcs) { if (must_queue() && _queue->read_space() > 0) { LV2_Atom obj; @@ -93,7 +92,7 @@ EdgeImpl::get_sources(Context& context, head()->buffer_type(), sizeof(LV2_Atom) + obj.size); void* data = buf->port_data(PortType::ATOM, context.offset()); _queue->read(sizeof(LV2_Atom) + obj.size, (LV2_Atom*)data); - srcs[num_srcs++] = buf; + srcs[num_srcs++] = buf.get(); } else if (must_mix()) { // Mixing down voices: every src voice mixed into every dst voice for (uint32_t v = 0; v < _tail->poly(); ++v) { @@ -116,7 +115,7 @@ EdgeImpl::queue(Context& context) const Ingen::Shared::URIs& uris = _tail->bufs().uris(); - boost::intrusive_ptr src_buf = _tail->buffer(0); + BufferRef src_buf = _tail->buffer(0); if (src_buf->atom()->type != uris.atom_Sequence) { Raul::error << "Queued edge source is not a Sequence" << std::endl; return; -- cgit v1.2.1