X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fdisk_reader.cc;h=0df940a13b97dcbd099ff44f12f0392988ad49c5;hb=3ec845b1ef1184719de2160bf572b667c9aa4bda;hp=252fee96bd4c9027b73825cb023ea22a0f48b16a;hpb=1a2820a886a72637f3509a35a576370200a82280;p=ardour.git diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc index 252fee96bd..0df940a13b 100644 --- a/libs/ardour/disk_reader.cc +++ b/libs/ardour/disk_reader.cc @@ -1153,7 +1153,7 @@ DiskReader::get_midi_playback (MidiBuffer& dst, samplepos_t start_sample, sample } - if (!_no_disk_output && (ms & MonitoringInput)) { + if (!pending_overwrite() && !_no_disk_output && (ms & MonitoringInput)) { dst.merge_from (*target, nframes); } @@ -1173,13 +1173,6 @@ DiskReader::get_midi_playback (MidiBuffer& dst, samplepos_t start_sample, sample #endif } -/** @a start is set to the new sample position (TIME) read up to */ -int -DiskReader::midi_read (samplepos_t& start, samplecnt_t dur, bool reversed) -{ - return 0; -} - int DiskReader::refill_midi () {