optimize some performance bottlenecks; remove jack_nframes_t that crept back into the code

git-svn-id: svn://localhost/ardour2/branches/midi@1779 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 8 insertions, 8 deletions

diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc
index 0352e1e910..d1b2a58e82 100644
--- a/libs/ardour/midi_playlist.cc
+++ b/libs/ardour/midi_playlist.cc
@@ -100,7 +100,7 @@ MidiPlaylist::MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other, string
 */
 }
 
-MidiPlaylist::MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other, jack_nframes_t start, jack_nframes_t dur, string name, bool hidden)
+MidiPlaylist::MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other, nframes_t start, nframes_t dur, string name, bool hidden)
 		: Playlist (other, start, dur, name, hidden)
 {
 	/* this constructor does NOT notify others (session) */
@@ -118,9 +118,9 @@ struct RegionSortByLayer {
 };
 
 /** Returns the number of frames in time duration read (eg could be large when 0 events are read) */
-jack_nframes_t
-MidiPlaylist::read (MidiRingBuffer& dst, jack_nframes_t start,
-                     jack_nframes_t dur, unsigned chan_n)
+nframes_t
+MidiPlaylist::read (MidiRingBuffer& dst, nframes_t start,
+                     nframes_t dur, unsigned chan_n)
 {
 	/* this function is never called from a realtime thread, so
 	   its OK to block (for short intervals).
@@ -128,10 +128,10 @@ MidiPlaylist::read (MidiRingBuffer& dst, jack_nframes_t start,
 
 	Glib::Mutex::Lock rm (region_lock);
 
-	jack_nframes_t ret         = 0;
-	jack_nframes_t end         = start + dur - 1;
-	//jack_nframes_t read_frames = 0;
-	//jack_nframes_t skip_frames = 0;
+	nframes_t ret         = 0;
+	nframes_t end         = start + dur - 1;
+	//nframes_t read_frames = 0;
+	//nframes_t skip_frames = 0;
 
 	//_read_data_count = 0;