Remove all use of nframes_t.

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

1 files changed, 11 insertions, 11 deletions

diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index bd1428a129..32163551a0 100644
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -52,7 +52,7 @@ public:
 	bool set_name (const std::string& newname) { return (set_source_name(newname, false) == 0); }
 
 	void append_event_unlocked_beats (const Evoral::Event<Evoral::MusicalTime>& ev);
-	void append_event_unlocked_frames (const Evoral::Event<nframes_t>& ev, framepos_t source_start);
+	void append_event_unlocked_frames (const Evoral::Event<framepos_t>& ev, framepos_t source_start);
 
 	void mark_streaming_midi_write_started (NoteMode mode, framepos_t start_time);
 	void mark_streaming_write_completed ();
@@ -65,7 +65,7 @@ public:
 
 	void flush_midi ();
 
-	static void set_header_position_offset (nframes_t offset, bool negative);
+	static void set_header_position_offset (framecnt_t offset, bool negative);
 
 	static bool safe_midi_file_extension (const std::string& path);
 
@@ -73,15 +73,15 @@ public:
         void set_path (const std::string& newpath);
         
   private:
-	nframes_t read_unlocked (Evoral::EventSink<nframes_t>& dst,
-				 framepos_t position,
-				 framepos_t start,
-				 nframes_t cnt,
-				 MidiStateTracker* tracker) const;
-
-	nframes_t write_unlocked (MidiRingBuffer<nframes_t>& src,
-			framepos_t position,
-			nframes_t cnt);
+	framecnt_t read_unlocked (Evoral::EventSink<framepos_t>& dst,
+				  framepos_t position,
+				  framepos_t start,
+				  framecnt_t cnt,
+				  MidiStateTracker* tracker) const;
+
+	framecnt_t write_unlocked (MidiRingBuffer<framepos_t>& src,
+				   framepos_t position,
+				   framecnt_t cnt);
 
 	double    _last_ev_time_beats;
 	framepos_t _last_ev_time_frames;