From 86f24d20e1616ffaafc97de65db49fd6a91270f8 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 16 Jun 2009 14:58:33 +0000 Subject: first pass (ok, third really) at internal send+return - audio routing inside ardour without JACK. lots still to do, but at least the obvious works git-svn-id: svn://localhost/ardour2/branches/3.0@5202 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/midi_buffer.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'libs/ardour/midi_buffer.cc') diff --git a/libs/ardour/midi_buffer.cc b/libs/ardour/midi_buffer.cc index bce47411cd..887545c662 100644 --- a/libs/ardour/midi_buffer.cc +++ b/libs/ardour/midi_buffer.cc @@ -99,6 +99,17 @@ MidiBuffer::read_from (const Buffer& src, nframes_t nframes, nframes_t dst_offse _silent = src.silent(); } +void +MidiBuffer::merge_from (const Buffer& src, nframes_t nframes, nframes_t dst_offset, nframes_t src_offset) +{ + const MidiBuffer* mbuf = dynamic_cast(&src); + assert (mbuf); + assert (mbuf != this); + + /* XXX use nframes, and possible offsets */ + merge_in_place (*mbuf); +} + /** Push an event into the buffer. * * Note that the raw MIDI pointed to by ev will be COPIED and unmodified. -- cgit v1.2.3