track notes at the region level in MidiPlaylist; resolve them (deliver note offs...

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

diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc
index 9f0a021274a88d731235dc587eb919f187d846a3..20119e20b69bcc7c080f41104ebecf9536d76aa9 100644 (file)
--- a/libs/ardour/midi_source.cc
+++ b/libs/ardour/midi_source.cc
@@ -35,6 +35,7 @@
 #include "ardour/audioengine.h"
 #include "ardour/midi_model.h"
 #include "ardour/midi_ring_buffer.h"
+#include "ardour/midi_state_tracker.h"
 #include "ardour/midi_source.h"
 #include "ardour/session.h"
 #include "ardour/session_directory.h"
@@ -60,7 +61,7 @@ MidiSource::MidiSource (Session& s, string name, Source::Flag flags)
 {
 }
 
-MidiSource::MidiSource (Session& s, const XMLNode& node) 
+MidiSource::MidiSource (Session& s, const XMLNode& node)
        : Source (s, node)
        , _read_data_count(0)
        , _write_data_count(0)
@@ -72,7 +73,7 @@ MidiSource::MidiSource (Session& s, const XMLNode& node)
        _read_data_count = 0;
        _write_data_count = 0;
 
-       if (set_state (node)) {
+       if (set_state (node, Stateful::loading_state_version)) {
                throw failed_constructor();
        }
 }
@@ -94,7 +95,7 @@ MidiSource::get_state ()
 }
 
 int
-MidiSource::set_state (const XMLNode& node)
+MidiSource::set_state (const XMLNode& node, int version)
 {
        const XMLProperty* prop;
 
@@ -113,7 +114,7 @@ MidiSource::length (sframes_t pos) const
 }
 
 void
-MidiSource::update_length (sframes_t pos, sframes_t cnt)
+MidiSource::update_length (sframes_t /*pos*/, sframes_t /*cnt*/)
 {
        // You're not the boss of me!
 }
@@ -126,8 +127,9 @@ MidiSource::invalidate ()
 
 nframes_t
 MidiSource::midi_read (MidiRingBuffer<nframes_t>& dst, sframes_t source_start,
-               sframes_t start, nframes_t cnt,
-               sframes_t stamp_offset, sframes_t negative_stamp_offset) const
+                      sframes_t start, nframes_t cnt,
+                      sframes_t stamp_offset, sframes_t negative_stamp_offset,
+                      MidiStateTracker* tracker) const
 {
        Glib::Mutex::Lock lm (_lock);
 
@@ -137,29 +139,36 @@ MidiSource::midi_read (MidiRingBuffer<nframes_t>& dst, sframes_t source_start,
 #define BEATS_TO_FRAMES(t) (converter.to(t) + stamp_offset - negative_stamp_offset)
 
                Evoral::Sequence<double>::const_iterator& i = _model_iter;
-               
-               if (_last_read_end == 0 || start != _last_read_end) { // || !i.valid()) {
-                       cerr << "MidiSource seeking to " << start << " from " << _last_read_end << endl;
+
+               if (_last_read_end == 0 || start != _last_read_end || !i.valid()) {
                        for (i = _model->begin(); i != _model->end(); ++i) {
                                if (BEATS_TO_FRAMES(i->time()) >= start) {
                                        break;
                                }
                        }
                }
-               
+
                _last_read_end = start + cnt;
 
                for (; i != _model->end(); ++i) {
                        const sframes_t time_frames = BEATS_TO_FRAMES(i->time());
                        if (time_frames < source_start + start + cnt) {
                                dst.write(time_frames, i->event_type(), i->size(), i->buffer());
+                               if (tracker) {
+                                       Evoral::MIDIEvent<Evoral::MusicalTime>& ev (*(Evoral::MIDIEvent<Evoral::MusicalTime>*) (&(*i)));
+                                       if (ev.is_note_on()) {
+                                               tracker->add (ev.note(), ev.channel());
+                                       } else if (ev.is_note_off()) {
+                                               tracker->remove (ev.note(), ev.channel());
+                                       }
+                               }
                        } else {
                                break;
                        }
                }
                return cnt;
        } else {
-               return read_unlocked (dst, source_start, start, cnt, stamp_offset, negative_stamp_offset);
+               return read_unlocked (dst, source_start, start, cnt, stamp_offset, negative_stamp_offset, tracker);
        }
 }
 
@@ -168,7 +177,7 @@ MidiSource::midi_write (MidiRingBuffer<nframes_t>& source, sframes_t source_star
 {
        Glib::Mutex::Lock lm (_lock);
        const nframes_t ret = write_unlocked (source, source_start, duration);
-       _last_write_end = source_start + duration;
+       _last_write_end += duration;
        return ret;
 }
 
@@ -178,7 +187,7 @@ MidiSource::file_changed (string path)
        struct stat stat_file;
 
        int e1 = stat (path.c_str(), &stat_file);
-       
+
        return !e1;
 }
 
@@ -234,7 +243,7 @@ MidiSource::session_saved()
                        stringstream ss(basename.substr(last_dash+1));
                        unsigned write_count = 0;
                        ss >> write_count;
-                       cerr << "WRITE COUNT: " << write_count << endl;
+                       // cerr << "WRITE COUNT: " << write_count << endl;
                        ++write_count; // start at 1
                        ss.clear();
                        ss << basename.substr(0, last_dash) << "-" << write_count;
@@ -253,7 +262,7 @@ MidiSource::session_saved()
                // cyclic dependency here, ugly :(
                newsrc->set_model(_model);
                _model->set_midi_source(newsrc.get());
-               
+
                newsrc->flush_midi();
 
                Switched.emit(newsrc);