rename a method to be more clear; remove an unused method from DiskReader

diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h
index 8f96a0d7d59a8892e4403a798166984f55072b1f..faeeaf1f529e4a75c0aa64f1a8b8ecdf3a3e3791 100644 (file)
--- a/libs/ardour/ardour/disk_reader.h
+++ b/libs/ardour/ardour/disk_reader.h
@@ -149,8 +149,7 @@ class LIBARDOUR_API DiskReader : public DiskIOProcessor
 
        frameoffset_t calculate_playback_distance (pframes_t);
 
-       void get_playback (MidiBuffer& dst, framecnt_t nframes, MonitorState, BufferSet&, double speed, framecnt_t distance);
-       void flush_playback (framepos_t start, framepos_t end);
+       void get_midi_playback (MidiBuffer& dst, framecnt_t nframes, MonitorState, BufferSet&, double speed, framecnt_t distance);
 };
 
 } // namespace

diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc
index 9f53938f497ebdac4e41cbe5fd37ee98e5dfd90b..1eb595b3ed0ad81e6ada208bb9a29fc154263e11 100644 (file)
--- a/libs/ardour/disk_reader.cc
+++ b/libs/ardour/disk_reader.cc
@@ -374,8 +374,7 @@ DiskReader::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame,
 
        if (!_session.declick_out_pending()) {
                if (ms & MonitoringDisk) {
-                       MidiBuffer& mbuf (bufs.get_midi (0));
-                       get_playback (mbuf, playback_distance, ms, scratch_bufs, speed, playback_distance);
+                       get_midi_playback (bufs.get_midi (0), playback_distance, ms, scratch_bufs, speed, playback_distance);
                }
        }
 
@@ -1188,18 +1187,11 @@ DiskReader::resolve_tracker (Evoral::EventSink<framepos_t>& buffer, framepos_t t
        }
 }
 
-void
-DiskReader::flush_playback (framepos_t start, framepos_t end)
-{
-       _midi_buf->flush (start, end);
-       g_atomic_int_add (&_frames_read_from_ringbuffer, end - start);
-}
-
 /** Writes playback events from playback_sample for nframes to dst, translating time stamps
  *  so that an event at playback_sample has time = 0
  */
 void
-DiskReader::get_playback (MidiBuffer& dst, framecnt_t nframes, MonitorState ms, BufferSet& scratch_bufs, double speed, framecnt_t playback_distance)
+DiskReader::get_midi_playback (MidiBuffer& dst, framecnt_t nframes, MonitorState ms, BufferSet& scratch_bufs, double speed, framecnt_t playback_distance)
 {
        MidiBuffer* target;