summaryrefslogtreecommitdiff
path: root/libs/ardour/disk_reader.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2017-06-13 14:54:33 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2017-09-18 11:40:53 -0400
commit645f68276bc51e1783846b9654e26bb3909e038c (patch)
treee94062b1d13e63e39e9f103df10278ecc3317755 /libs/ardour/disk_reader.cc
parent8c04457be14673385287def048c387b3953fa8e8 (diff)
rename a method to be more clear; remove an unused method from DiskReader
Diffstat (limited to 'libs/ardour/disk_reader.cc')
-rw-r--r--libs/ardour/disk_reader.cc12
1 files changed, 2 insertions, 10 deletions
diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc
index 9f53938f49..1eb595b3ed 100644
--- 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;