diff options
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/debug.h | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/midi_buffer.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/ardour/debug.h b/libs/ardour/ardour/debug.h index 8ab4a4d9fd..58bc4f7af4 100644 --- a/libs/ardour/ardour/debug.h +++ b/libs/ardour/ardour/debug.h @@ -55,6 +55,7 @@ namespace PBD { extern uint64_t AudioUnits; extern uint64_t ControlProtocols; extern uint64_t CycleTimers; + extern uint64_t MidiTrackers; } } 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> |