Remove all use of nframes_t.

git-svn-id: svn://localhost/ardour2/branches/3.0@8166 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 5 insertions, 5 deletions

diff --git a/libs/ardour/ardour/midi_buffer.h b/libs/ardour/ardour/midi_buffer.h
index b3ed093df7..18a95e9347 100644
--- a/libs/ardour/ardour/midi_buffer.h
+++ b/libs/ardour/ardour/midi_buffer.h
@@ -32,14 +32,14 @@ namespace ARDOUR {
 class MidiBuffer : public Buffer
 {
 public:
-	typedef nframes_t TimeType;
+	typedef framepos_t TimeType;
 
 	MidiBuffer(size_t capacity);
 	~MidiBuffer();
 
-	void silence (nframes_t nframes, nframes_t offset = 0);
-	void read_from (const Buffer& src, nframes_t nframes, nframes_t dst_offset = 0, nframes_t src_offset = 0);
-	void merge_from (const Buffer& src, nframes_t nframes, nframes_t dst_offset = 0, nframes_t src_offset = 0);
+	void silence (framecnt_t nframes, framecnt_t offset = 0);
+	void read_from (const Buffer& src, framecnt_t nframes, framecnt_t dst_offset = 0, framecnt_t src_offset = 0);
+	void merge_from (const Buffer& src, framecnt_t nframes, framecnt_t dst_offset = 0, framecnt_t src_offset = 0);
 
 	void copy(const MidiBuffer& copy);
 
@@ -55,7 +55,7 @@ public:
 
 	template<typename BufferType, typename EventType>
 	struct iterator_base {
-		iterator_base<BufferType, EventType>(BufferType& b, nframes_t o) : buffer(b), offset(o) {}
+		iterator_base<BufferType, EventType>(BufferType& b, framecnt_t o) : buffer(b), offset(o) {}
 		inline EventType operator*() const {
 			uint8_t* ev_start = buffer._data + offset + sizeof(TimeType);
 			int event_size = Evoral::midi_event_size(ev_start);