diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-21 16:36:05 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-21 16:36:05 +0000 |
commit | 22f6b991300e265ecfe0e8fb9e52f36a0cd2912a (patch) | |
tree | 463bf547bcd633f851c692bc0095a495b5bda3e3 /libs/ardour/midi_buffer.cc | |
parent | e0ebeb3d5dc6096d8a91931b5627864015f68d34 (diff) |
#ifdef out some expensive code from midibuffer merging (debug only, and we pretty much know it works)
git-svn-id: svn://localhost/ardour2/branches/3.0@10733 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_buffer.cc')
-rw-r--r-- | libs/ardour/midi_buffer.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/ardour/midi_buffer.cc b/libs/ardour/midi_buffer.cc index a2f078d8a5..f62a3b4c39 100644 --- a/libs/ardour/midi_buffer.cc +++ b/libs/ardour/midi_buffer.cc @@ -284,6 +284,7 @@ MidiBuffer::merge_in_place(const MidiBuffer &other) } #ifndef NDEBUG +#ifdef TEST_MIDI_MERGE size_t test_orig_us_size = _size; size_t test_orig_them_size = other._size; TimeType test_time = 0; @@ -303,6 +304,7 @@ MidiBuffer::merge_in_place(const MidiBuffer &other) ++test_them_count; } #endif +#endif const_iterator them = other.begin(); iterator us = begin(); @@ -362,6 +364,7 @@ MidiBuffer::merge_in_place(const MidiBuffer &other) } #ifndef NDEBUG +#ifdef TEST_MIDI_MERGE assert(_size == test_orig_us_size + test_orig_them_size); size_t test_final_count = 0; test_time = 0; @@ -374,6 +377,7 @@ MidiBuffer::merge_in_place(const MidiBuffer &other) } assert(test_final_count = test_us_count + test_them_count); #endif +#endif return true; } |