globally change all use of "frame" to refer to audio into "sample".

[ardour.git] / libs / ardour / ardour / midi_buffer.h

diff --git a/libs/ardour/ardour/midi_buffer.h b/libs/ardour/ardour/midi_buffer.h
index cc48e28d618fa5b8ee2446a2155b4cbdfa51f618..509b60f12d354efccf1f5d7dd9ad106a7ae8fb97 100644 (file)
--- a/libs/ardour/ardour/midi_buffer.h
+++ b/libs/ardour/ardour/midi_buffer.h
@@ -33,17 +33,17 @@ namespace ARDOUR {
 
 
 /** Buffer containing 8-bit unsigned char (MIDI) data. */
-class LIBARDOUR_API MidiBuffer : public Buffer, public Evoral::EventSink<framepos_t>
+class LIBARDOUR_API MidiBuffer : public Buffer, public Evoral::EventSink<samplepos_t>
 {
 public:
-       typedef framepos_t TimeType;
+       typedef samplepos_t TimeType;
 
        MidiBuffer(size_t capacity);
        ~MidiBuffer();
 
-       void silence (framecnt_t nframes, framecnt_t offset = 0);
-       void read_from (const Buffer& src, framecnt_t nframes, frameoffset_t dst_offset = 0, frameoffset_t src_offset = 0);
-       void merge_from (const Buffer& src, framecnt_t nframes, frameoffset_t dst_offset = 0, frameoffset_t src_offset = 0);
+       void silence (samplecnt_t nframes, samplecnt_t offset = 0);
+       void read_from (const Buffer& src, samplecnt_t nframes, sampleoffset_t dst_offset = 0, sampleoffset_t src_offset = 0);
+       void merge_from (const Buffer& src, samplecnt_t nframes, sampleoffset_t dst_offset = 0, sampleoffset_t src_offset = 0);
 
        void copy(const MidiBuffer& copy);
        void copy(MidiBuffer const * const);
@@ -67,7 +67,7 @@ public:
                class iterator_base
        {
        public:
-               iterator_base<BufferType, EventType>(BufferType& b, framecnt_t o)
+               iterator_base<BufferType, EventType>(BufferType& b, samplecnt_t o)
                        : buffer(&b), offset(o) {}
 
                iterator_base<BufferType, EventType>(const iterator_base<BufferType,EventType>& o)