Remove all use of nframes_t.

[ardour.git] / libs / ardour / midi_source.cc

diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc
index b105aa00c5b9db3d56986df1b8ab2ceab34bd622..120ee29e8eff58a536cf2401f9dae4444bafcf7e 100644 (file)
--- a/libs/ardour/midi_source.cc
+++ b/libs/ardour/midi_source.cc
@@ -196,9 +196,9 @@ MidiSource::invalidate ()
 }
 
 /** @param filtered A set of parameters whose MIDI messages will not be returned */
-nframes_t
-MidiSource::midi_read (Evoral::EventSink<nframes_t>& dst, framepos_t source_start,
-                       framepos_t start, nframes_t cnt,
+framecnt_t
+MidiSource::midi_read (Evoral::EventSink<framepos_t>& dst, framepos_t source_start,
+                       framepos_t start, framecnt_t cnt,
                        MidiStateTracker* tracker,
                       std::set<Evoral::Parameter> const & filtered) const
 {
@@ -251,11 +251,15 @@ MidiSource::midi_read (Evoral::EventSink<nframes_t>& dst, framepos_t source_star
        }
 }
 
-nframes_t
-MidiSource::midi_write (MidiRingBuffer<nframes_t>& source, framepos_t source_start, nframes_t duration)
+/** Write data from a MidiRingBuffer to this source.
+ *  @param source Source to read from.
+ *  @param source_start This source's start position in session frames.
+ */
+framecnt_t
+MidiSource::midi_write (MidiRingBuffer<framepos_t>& source, framepos_t source_start, framecnt_t duration)
 {
        Glib::Mutex::Lock lm (_lock);
-       const nframes_t ret = write_unlocked (source, source_start, duration);
+       const framecnt_t ret = write_unlocked (source, source_start, duration);
        _last_write_end += duration;
        return ret;
 }
@@ -310,8 +314,8 @@ MidiSource::clone (Evoral::MusicalTime begin, Evoral::MusicalTime end)
         
         boost::shared_ptr<MidiSource> newsrc = boost::dynamic_pointer_cast<MidiSource>(
                 SourceFactory::createWritable(DataType::MIDI, _session,
-                                              newpath, false, _session.frame_rate()));
-        
+                                              newpath, string(), false, _session.frame_rate()));
+
         newsrc->set_timeline_position(_timeline_position);
        newsrc->copy_interpolation_from (this);
        newsrc->copy_automation_state_from (this);