Fix MidiBuffer::merge_in_place and add aggressive correctness checking.

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

diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc
index bb3603b8a82551244bd3109dff8a28c97a843194..49b5ff2c4f6f8282fd967301456586dfe20bc478 100644 (file)
--- a/libs/ardour/midi_playlist.cc
+++ b/libs/ardour/midi_playlist.cc
@@ -1,17 +1,17 @@
 /*
-    Copyright (C) 2006 Paul Davis 
-       Written by Dave Robillard, 2006
+    Copyright (C) 2006 Paul Davis
+    Written by Dave Robillard, 2006
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
- 
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
- 
+
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
@@ -48,7 +48,7 @@ MidiPlaylist::MidiPlaylist (Session& session, const XMLNode& node, bool hidden)
        assert(prop && DataType(prop->value()) == DataType::MIDI);
 
        in_set_state++;
-       set_state (node);
+       set_state (node, Stateful::loading_state_version);
        in_set_state--;
 }
 
@@ -91,7 +91,7 @@ MidiPlaylist::MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other, string
                                        out_o++;
                                        out_n++;
                                }
-                               //                              cerr << "HUH!? second region in the crossfade not found!" << endl;
+                               // cerr << "HUH!? second region in the crossfade not found!" << endl;
                        }
                }
 
@@ -109,10 +109,10 @@ MidiPlaylist::MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other, nframes
 
 MidiPlaylist::~MidiPlaylist ()
 {
-       GoingAway (); /* EMIT SIGNAL */
-       
+       GoingAway (); /* EMIT SIGNAL */
+
        /* drop connections to signals */
-       
+
        notify_callbacks ();
 }
 
@@ -137,12 +137,21 @@ MidiPlaylist::read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t d
        _read_data_count = 0;
 
        // relevent regions overlapping start <--> end
-       vector<boost::shared_ptr<Region> > regs;
+       vector< boost::shared_ptr<Region> > regs;
 
        for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
-
                if ((*i)->coverage (start, end) != OverlapNone) {
                        regs.push_back(*i);
+               } else {
+                       /* region does not cover the current read boundaries, so make
+                          sure that we silence any notes that it had turned on
+                       */
+                       NoteTrackers::iterator t = _note_trackers.find ((*i).get());
+                       if (t != _note_trackers.end()) {
+                               t->second->resolve_notes (dst, (*i)->last_frame());
+                               delete t->second;
+                               _note_trackers.erase (t);
+                       }
                }
        }
 
@@ -150,10 +159,22 @@ MidiPlaylist::read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t d
        sort(regs.begin(), regs.end(), layer_cmp);
 
        for (vector<boost::shared_ptr<Region> >::iterator i = regs.begin(); i != regs.end(); ++i) {
-               // FIXME: ensure time is monotonic here?
                boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(*i);
                if (mr) {
-                       mr->read_at (dst, start, dur, chan_n, _note_mode);
+
+                       NoteTrackers::iterator t = _note_trackers.find ((*i).get());
+                       MidiStateTracker* tracker;
+
+                       if (t == _note_trackers.end()) {
+                               pair<Region*,MidiStateTracker*> newpair;
+                               newpair.first = (*i).get();
+                               tracker = newpair.second = new MidiStateTracker;
+                               _note_trackers.insert (newpair);
+                       } else {
+                               tracker = t->second;
+                       }
+
+                       mr->read_at (dst, start, dur, chan_n, _note_mode, tracker);
                        _read_data_count += mr->read_data_count();
                }
        }
@@ -161,40 +182,47 @@ MidiPlaylist::read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t d
        return dur;
 }
 
-
 void
 MidiPlaylist::remove_dependents (boost::shared_ptr<Region> region)
 {
-       /* MIDI regions have no dependents (crossfades) */
+       /* MIDI regions have no dependents (crossfades) but we might be tracking notes */
+       NoteTrackers::iterator t = _note_trackers.find (region.get());
+
+       /* GACK! THREAD SAFETY! */
+
+       if (t != _note_trackers.end()) {
+               delete t->second;
+               _note_trackers.erase (t);
+       }
 }
 
 
 void
-MidiPlaylist::refresh_dependents (boost::shared_ptr<Region> r)
+MidiPlaylist::refresh_dependents (boost::shared_ptr<Region> /*r*/)
 {
        /* MIDI regions have no dependents (crossfades) */
 }
 
 void
-MidiPlaylist::finalize_split_region (boost::shared_ptr<Region> original, boost::shared_ptr<Region> left, boost::shared_ptr<Region> right)
+MidiPlaylist::finalize_split_region (boost::shared_ptr<Region> /*original*/, boost::shared_ptr<Region> /*left*/, boost::shared_ptr<Region> /*right*/)
 {
        /* No MIDI crossfading (yet?), so nothing to do here */
 }
 
 void
-MidiPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
+MidiPlaylist::check_dependents (boost::shared_ptr<Region> /*r*/, bool /*norefresh*/)
 {
        /* MIDI regions have no dependents (crossfades) */
 }
 
 
 int
-MidiPlaylist::set_state (const XMLNode& node)
+MidiPlaylist::set_state (const XMLNode& node, int version)
 {
        in_set_state++;
        freeze ();
 
-       Playlist::set_state (node);
+       Playlist::set_state (node, version);
 
        thaw();
        in_set_state--;
@@ -296,7 +324,7 @@ MidiPlaylist::region_changed (Change what_changed, boost::shared_ptr<Region> reg
        }
 
        // Feeling rather uninterested today, but thanks for the heads up anyway!
-       
+
        Change our_interests = Change (/*MidiRegion::FadeInChanged|
                                       MidiRegion::FadeOutChanged|
                                       MidiRegion::FadeInActiveChanged|