diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-10-08 20:14:22 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-10-08 20:14:22 +0000 |
| commit | 89e4d352445e9394073804f78fbd6845e6820f20 (patch) | |
| tree | 14cf1f812444a3fa5271cc7c324e1d9a67c744e9 /libs/ardour/ardour/midi_buffer.h | |
| parent | 1d210a54f9b1c0da7a196413bd760ff53f198270 (diff) | |
torben's port buffer reworking; torben's panner automation loading patch (allows loading of 2.X sessions)
git-svn-id: svn://localhost/ardour2/branches/3.0@3890 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/midi_buffer.h')
| -rw-r--r-- | libs/ardour/ardour/midi_buffer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/ardour/ardour/midi_buffer.h b/libs/ardour/ardour/midi_buffer.h index 606cbd0ec8..812f697aa3 100644 --- a/libs/ardour/ardour/midi_buffer.h +++ b/libs/ardour/ardour/midi_buffer.h @@ -46,6 +46,7 @@ public: void resize(size_t); bool merge(const MidiBuffer& a, const MidiBuffer& b); + bool merge_in_place( const MidiBuffer &other ); struct iterator { iterator(MidiBuffer& b, size_t i) : buffer(b), index(i) {} |