summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/midi_buffer.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-12-22 20:14:47 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-12-22 20:14:47 +0000
commited2beaffeef72ddce8ac628cced672851ec5668d (patch)
treebdb318ac3bbfd06b8804e686db19b99ef5297d89 /libs/ardour/ardour/midi_buffer.h
parent2449a787c59b383912115421fdcd7ad4cca2a581 (diff)
main fix: when transport stops, clear per-region per-playlist note trackers even if there is no capture data to process; side effects: remove unused MidiBuffer::merge() and add DEBUG::MidiTrackers as well as more and better MIDI debug tracing facilities
git-svn-id: svn://localhost/ardour2/branches/3.0@11057 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/midi_buffer.h')
-rw-r--r--libs/ardour/ardour/midi_buffer.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/libs/ardour/ardour/midi_buffer.h b/libs/ardour/ardour/midi_buffer.h
index 611e890304..db02344249 100644
--- a/libs/ardour/ardour/midi_buffer.h
+++ b/libs/ardour/ardour/midi_buffer.h
@@ -50,7 +50,6 @@ public:
void resize(size_t);
- bool merge(const MidiBuffer& a, const MidiBuffer& b);
bool merge_in_place(const MidiBuffer &other);
template<typename BufferType, typename EventType>