summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libs/ardour/disk_reader.cc22
-rw-r--r--libs/ardour/midi_port.cc6
2 files changed, 24 insertions, 4 deletions
diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc
index 47cdc81ad2..6cb6bfcbd9 100644
--- a/libs/ardour/disk_reader.cc
+++ b/libs/ardour/disk_reader.cc
@@ -1351,9 +1351,25 @@ DiskReader::get_midi_playback (MidiBuffer& dst, samplecnt_t nframes, MonitorStat
dst.merge_from (*target, nframes);
}
- //cerr << "======== POST ========\n";
- //_midi_buf->dump (cerr);
- //cerr << "----------------\n";
+#if 0
+ if (!target->empty ()) {
+ cerr << "======== MIDI OUT ========\n";
+ for (MidiBuffer::iterator i = target->begin(); i != target->end(); ++i) {
+ const Evoral::Event<MidiBuffer::TimeType> ev (*i, false);
+ cerr << "MIDI EVENT (from disk) @ " << ev.time();
+ for (size_t xx = 0; xx < ev.size(); ++xx) {
+ cerr << ' ' << hex << (int) ev.buffer()[xx];
+ }
+ cerr << dec << endl;
+ }
+ cerr << "----------------\n";
+ }
+#endif
+#if 0
+ cerr << "======== MIDI Disk Buffer ========\n";
+ _midi_buf->dump (cerr);
+ cerr << "----------------\n";
+#endif
}
/** @a start is set to the new sample position (TIME) read up to */
diff --git a/libs/ardour/midi_port.cc b/libs/ardour/midi_port.cc
index 4a6cc3a3af..a6553b7fb6 100644
--- a/libs/ardour/midi_port.cc
+++ b/libs/ardour/midi_port.cc
@@ -143,7 +143,11 @@ MidiPort::get_midi_buffer (pframes_t nframes)
(timestamp >= (_global_port_buffer_offset + _port_buffer_offset + nframes))) {
cerr << "Dropping incoming MIDI at time " << timestamp << "; offset="
<< _global_port_buffer_offset << " limit="
- << (_global_port_buffer_offset + _port_buffer_offset + nframes) << "\n";
+ << (_global_port_buffer_offset + _port_buffer_offset + nframes)
+ << " = (" << _global_port_buffer_offset
+ << " + " << _port_buffer_offset
+ << " + " << nframes
+ << ")\n";
continue;
}