From 30b087ab3d28f1585987fa3f6ae006562ae192e3 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 18 Sep 2017 12:39:17 -0400 Subject: globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible --- libs/ardour/midi_ring_buffer.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libs/ardour/midi_ring_buffer.cc') diff --git a/libs/ardour/midi_ring_buffer.cc b/libs/ardour/midi_ring_buffer.cc index 187de574b6..3b8f6fc39e 100644 --- a/libs/ardour/midi_ring_buffer.cc +++ b/libs/ardour/midi_ring_buffer.cc @@ -37,7 +37,7 @@ namespace ARDOUR { */ template size_t -MidiRingBuffer::read (MidiBuffer& dst, framepos_t start, framepos_t end, framecnt_t offset, bool stop_on_overflow_in_dst) +MidiRingBuffer::read (MidiBuffer& dst, samplepos_t start, samplepos_t end, samplecnt_t offset, bool stop_on_overflow_in_dst) { if (this->read_space() == 0) { return 0; @@ -129,7 +129,7 @@ MidiRingBuffer::read (MidiBuffer& dst, framepos_t start, framepos_t end, fram template size_t -MidiRingBuffer::skip_to(framepos_t start) +MidiRingBuffer::skip_to(samplepos_t start) { if (this->read_space() == 0) { return 0; @@ -194,7 +194,7 @@ MidiRingBuffer::skip_to(framepos_t start) template void -MidiRingBuffer::flush (framepos_t /*start*/, framepos_t end) +MidiRingBuffer::flush (samplepos_t /*start*/, samplepos_t end) { const size_t prefix_size = sizeof(T) + sizeof(Evoral::EventType) + sizeof(uint32_t); @@ -309,18 +309,18 @@ MidiRingBuffer::reset_tracker () template void -MidiRingBuffer::resolve_tracker (MidiBuffer& dst, framepos_t t) +MidiRingBuffer::resolve_tracker (MidiBuffer& dst, samplepos_t t) { _tracker.resolve_notes (dst, t); } template void -MidiRingBuffer::resolve_tracker (Evoral::EventSink& dst, framepos_t t) +MidiRingBuffer::resolve_tracker (Evoral::EventSink& dst, samplepos_t t) { _tracker.resolve_notes(dst, t); } -template class MidiRingBuffer; +template class MidiRingBuffer; } // namespace ARDOUR -- cgit v1.2.3