From 2212403431d6110d7d6047ec27fe17c9a8e00b80 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 27 Jul 2017 21:23:11 -0400 Subject: don't attempt MIDI playback if there are no MIDI buffers provided for processing --- libs/ardour/disk_reader.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libs') 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); } } -- cgit v1.2.3