diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-09-13 13:31:58 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-09-13 14:11:29 -0500 |
| commit | b32ca9e9d94affba4cb194d57267e185cc6d5553 (patch) | |
| tree | 787eb09b1dd921f8e559bb343c05338d0280e926 /libs/ardour/midi_buffer.cc | |
| parent | 22a903171347cc8f3776e4c539ca5f1172ec449c (diff) | |
change offset arguments to various <T>Buffer::read/merge methods from framecnt_t to frameoffset_t
Diffstat (limited to 'libs/ardour/midi_buffer.cc')
| -rw-r--r-- | libs/ardour/midi_buffer.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/ardour/midi_buffer.cc b/libs/ardour/midi_buffer.cc index 41d638dc78..87b0274068 100644 --- a/libs/ardour/midi_buffer.cc +++ b/libs/ardour/midi_buffer.cc @@ -95,7 +95,7 @@ MidiBuffer::copy(MidiBuffer const * const copy) * Note that offset and nframes refer to sample time, NOT buffer offsets or event counts. */ void -MidiBuffer::read_from (const Buffer& src, framecnt_t nframes, framecnt_t dst_offset, framecnt_t /* src_offset*/) +MidiBuffer::read_from (const Buffer& src, framecnt_t nframes, frameoffset_t dst_offset, frameoffset_t /* src_offset*/) { assert (src.type() == DataType::MIDI); assert (&src != this); @@ -129,7 +129,7 @@ MidiBuffer::read_from (const Buffer& src, framecnt_t nframes, framecnt_t dst_off } void -MidiBuffer::merge_from (const Buffer& src, framecnt_t /*nframes*/, framecnt_t /*dst_offset*/, framecnt_t /*src_offset*/) +MidiBuffer::merge_from (const Buffer& src, framecnt_t /*nframes*/, frameoffset_t /*dst_offset*/, frameoffset_t /*src_offset*/) { const MidiBuffer* mbuf = dynamic_cast<const MidiBuffer*>(&src); assert (mbuf); @@ -580,4 +580,3 @@ MidiBuffer::merge_in_place (const MidiBuffer &other) return true; } - |