summaryrefslogtreecommitdiff
path: root/libs/ardour/midi_buffer.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-12-21 19:56:40 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-12-21 19:56:40 +0000
commit8ab47031731dfff5937997b830aa72284a52cad1 (patch)
tree74815f613b8a2a7f5ac1a892d71e1b0de2dd09dd /libs/ardour/midi_buffer.cc
parent642ab99db859771640d7fa4afb6faf167513c81d (diff)
remove extraneous debugging output from MidiBuffer::merge_in_place()
git-svn-id: svn://localhost/ardour2/branches/3.0@11053 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_buffer.cc')
-rw-r--r--libs/ardour/midi_buffer.cc19
1 files changed, 0 insertions, 19 deletions
diff --git a/libs/ardour/midi_buffer.cc b/libs/ardour/midi_buffer.cc
index e383b3f3a2..8d07c308ee 100644
--- a/libs/ardour/midi_buffer.cc
+++ b/libs/ardour/midi_buffer.cc
@@ -403,20 +403,9 @@ MidiBuffer::merge_in_place(const MidiBuffer &other)
}
if (size() + other.size() > _capacity) {
- cerr << "MidiBuffer::merge failed (no space)" << endl;
return false;
}
- cerr << "MERGING\nUS: ";
- for (MidiBuffer::iterator i = begin(); i != end(); ++i) {
- cerr << *i << " ; ";
- }
- cerr << "\nTHEM: ";
- for (MidiBuffer::const_iterator i = other.begin(); i != other.end(); ++i) {
- cerr << *i << " ; ";
- }
- cerr << endl;
-
const_iterator them = other.begin();
iterator us = begin();
@@ -432,14 +421,11 @@ MidiBuffer::merge_in_place(const MidiBuffer &other)
merge_offset = -1;
bytes_to_merge = 0;
- cerr << "Start merge skip with them = " << *them << endl;
-
while (them != other.end() && (*them).time() < (*us).time()) {
if (merge_offset == -1) {
merge_offset = them.offset;
}
bytes_to_merge += sizeof (TimeType) + (*them).size();
- cerr << " move through other event " << *them << endl;
++them;
}
@@ -458,10 +444,6 @@ MidiBuffer::merge_in_place(const MidiBuffer &other)
* "them".
*/
- cerr << "merge skip done, sz = " << bytes_to_merge << " us @ end ? " << (us == end())
- << " them @ end ? " << (them == other.end())
- << endl;
-
if (bytes_to_merge) {
assert(merge_offset >= 0);
/* move existing */
@@ -545,7 +527,6 @@ MidiBuffer::merge_in_place(const MidiBuffer &other)
*/
while (us != end() && (*us).time() <= (*them).time()) {
- cerr << "skip by our own event " << (*us) << endl;
++us;
}
}