diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2017-07-27 21:23:11 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 11:40:53 -0400 |
commit | 2212403431d6110d7d6047ec27fe17c9a8e00b80 (patch) | |
tree | 1afe071bca618e13e543b2f4d69fd781080022ce | |
parent | b115a04babe8435eeaba36469eeb6145250c70cd (diff) |
don't attempt MIDI playback if there are no MIDI buffers provided for processing
-rw-r--r-- | libs/ardour/disk_reader.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc index 871c30df26..207978f733 100644 --- a/libs/ardour/disk_reader.cc +++ b/libs/ardour/disk_reader.cc @@ -391,7 +391,7 @@ DiskReader::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, /* MIDI data handling */ - if (!_session.declick_out_pending()) { + if (!_session.declick_out_pending() && bufs.count().n_midi()) { MidiBuffer* dst; if (_no_disk_output) { @@ -400,7 +400,7 @@ DiskReader::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, dst = &bufs.get_midi (0); } - if (ms & MonitoringDisk && !still_locating) { + if ((ms & MonitoringDisk) && !still_locating) { get_midi_playback (*dst, disk_samples_to_consume, ms, scratch_bufs, speed, disk_samples_to_consume); } } |