Merge branch 'master' of git.ardour.org:ardour/ardour

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

diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc
index 6c6821d773e60dd6d39ae89d5507b11c06defd9e..124d3f7c9bf11b4443befe29d068bbce86bcf074 100644 (file)
--- a/libs/ardour/midi_source.cc
+++ b/libs/ardour/midi_source.cc
@@ -59,7 +59,8 @@ MidiSource::MidiSource (Session& s, string name, Source::Flag flags)
        , _model_iter_valid(false)
        , _length_beats(0.0)
        , _last_read_end(0)
-       , _last_write_end(0)
+       , _capture_length(0)
+       , _capture_loop_length(0)
 {
 }
 
@@ -69,7 +70,8 @@ MidiSource::MidiSource (Session& s, const XMLNode& node)
        , _model_iter_valid(false)
        , _length_beats(0.0)
        , _last_read_end(0)
-       , _last_write_end(0)
+       , _capture_length(0)
+       , _capture_loop_length(0)
 {
        if (set_state (node, Stateful::loading_state_version)) {
                throw failed_constructor();
@@ -195,7 +197,7 @@ MidiSource::midi_read (Evoral::EventSink<framepos_t>& dst, framepos_t source_sta
                        MidiStateTracker* tracker,
                        std::set<Evoral::Parameter> const & filtered) const
 {
-       Glib::Mutex::Lock lm (_lock);
+       Glib::Threads::Mutex::Lock lm (_lock);
 
        BeatsFramesConverter converter(_session.tempo_map(), source_start);
 
@@ -232,7 +234,8 @@ MidiSource::midi_read (Evoral::EventSink<framepos_t>& dst, framepos_t source_sta
                                                                                   _name, time_frames + source_start, i->event_type(), i->size()));
 
                                if (tracker) {
-                                       Evoral::MIDIEvent<Evoral::MusicalTime>& ev (*(Evoral::MIDIEvent<Evoral::MusicalTime>*) (&(*i)));
+                                       Evoral::MIDIEvent<Evoral::MusicalTime>& ev (*(reinterpret_cast<Evoral::MIDIEvent<Evoral::MusicalTime>*> 
+                                                                                     (const_cast<Evoral::Event<Evoral::MusicalTime>*> (&(*i)))));
                                        if (ev.is_note_on()) {
                                                DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("\t%1 track note on %2 @ %3 velocity %4\n", _name, (int) ev.note(), time_frames, (int) ev.velocity()));
                                                tracker->add (ev.note(), ev.channel());
@@ -253,21 +256,19 @@ MidiSource::midi_read (Evoral::EventSink<framepos_t>& dst, framepos_t source_sta
        }
 }
 
-/** 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)
+MidiSource::midi_write (MidiRingBuffer<framepos_t>& source,
+                        framepos_t                  source_start,
+                        framecnt_t                  cnt)
 {
-       Glib::Mutex::Lock lm (_lock);
+       Glib::Threads::Mutex::Lock lm (_lock);
 
-       const framecnt_t ret = write_unlocked (source, source_start, duration);
+       const framecnt_t ret = write_unlocked (source, source_start, cnt);
 
-       if (duration == max_framecnt) {
+       if (cnt == max_framecnt) {
                _last_read_end = 0;
        } else {
-               _last_write_end += duration;
+               _capture_length += cnt;
        }
 
        return ret;
@@ -285,10 +286,12 @@ MidiSource::mark_streaming_midi_write_started (NoteMode mode)
 }
 
 void
-MidiSource::mark_write_starting_now ()
+MidiSource::mark_write_starting_now (framecnt_t position,
+                                     framecnt_t capture_length,
+                                     framecnt_t loop_length)
 {
        /* I'm not sure if this is the best way to approach this, but
-          _last_write_end needs to be set up with the transport frame
+          _capture_length needs to be set up with the transport frame
           when a record actually starts, as it is used by
           SMFSource::write_unlocked to decide whether incoming notes
           are within the correct time range.
@@ -298,10 +301,12 @@ MidiSource::mark_write_starting_now ()
           because it is not RT-safe.
        */
 
-       set_timeline_position (_session.transport_frame ());
-       _last_write_end = _session.transport_frame ();
-       cerr << name() << " last write set to " << _last_write_end << endl;
+       set_timeline_position(position);
+       _capture_length      = capture_length;
+       _capture_loop_length = loop_length;
 
+       BeatsFramesConverter converter(_session.tempo_map(), position);
+       _length_beats = converter.from(capture_length);
 }
 
 void
@@ -350,7 +355,7 @@ MidiSource::clone (const string& path, Evoral::MusicalTime begin, Evoral::Musica
 
        boost::shared_ptr<MidiSource> newsrc = boost::dynamic_pointer_cast<MidiSource>(
                SourceFactory::createWritable(DataType::MIDI, _session,
-                                             newpath, string(), false, _session.frame_rate()));
+                                             newpath, false, _session.frame_rate()));
 
        newsrc->set_timeline_position(_timeline_position);
        newsrc->copy_interpolation_from (this);
@@ -388,7 +393,7 @@ MidiSource::session_saved()
        */
 
        if (_model && _model->edited()) {
-
+               
                // if the model is edited, write its contents into
                // the current source file (overwiting previous contents.