torben's port buffer reworking; torben's panner automation loading patch (allows...

[ardour.git] / libs / ardour / ardour / midi_buffer.h

diff --git a/libs/ardour/ardour/midi_buffer.h b/libs/ardour/ardour/midi_buffer.h
index 606cbd0ec80db06956af2eb7dcff8b95231a577c..812f697aa3de32f1765063c12bf47ba2bb09e3e4 100644 (file)
--- 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) {}