smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 11:46:25 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Paul Davis 2017-06-13 14:54:33 -04:00
parent 8c04457be1
commit 645f68276b
2 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libs/ardour/ardour/disk_reader.h
View file

@ -149,8 +149,7 @@ class LIBARDOUR_API DiskReader : public DiskIOProcessor
frameoffset_t calculate_playback_distance (pframes_t); frameoffset_t calculate_playback_distance (pframes_t);
void get_playback (MidiBuffer& dst, framecnt_t nframes, MonitorState, BufferSet&, double speed, framecnt_t distance); void get_midi_playback (MidiBuffer& dst, framecnt_t nframes, MonitorState, BufferSet&, double speed, framecnt_t distance);
void flush_playback (framepos_t start, framepos_t end);
}; };
} // namespace } // namespace

12
libs/ardour/disk_reader.cc
View file

@ -374,8 +374,7 @@ DiskReader::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame,
if (!_session.declick_out_pending()) { if (!_session.declick_out_pending()) {
if (ms & MonitoringDisk) { if (ms & MonitoringDisk) {
MidiBuffer& mbuf (bufs.get_midi (0)); get_midi_playback (bufs.get_midi (0), playback_distance, ms, scratch_bufs, speed, playback_distance);
get_playback (mbuf, 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 /** Writes playback events from playback_sample for nframes to dst, translating time stamps
* so that an event at playback_sample has time = 0 * so that an event at playback_sample has time = 0
*/ */
void 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; MidiBuffer* target;