Merge with trunk R2978.

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

diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc
index d1b2a58e8219dbe9d3a1f9d900dd16aa1a5a7b95..9720384130701ca22cf55a22b331644cd011b7c2 100644 (file)
--- a/libs/ardour/midi_playlist.cc
+++ b/libs/ardour/midi_playlist.cc
@@ -46,9 +46,9 @@ MidiPlaylist::MidiPlaylist (Session& session, const XMLNode& node, bool hidden)
        const XMLProperty* prop = node.property("type");
        assert(prop && DataType(prop->value()) == DataType::MIDI);
 
-       in_set_state = true;
+       in_set_state++;
        set_state (node);
-       in_set_state = false;
+       in_set_state--;
 }
 
 MidiPlaylist::MidiPlaylist (Session& session, string name, bool hidden)
@@ -109,6 +109,10 @@ MidiPlaylist::MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other, nframes
 MidiPlaylist::~MidiPlaylist ()
 {
        GoingAway (); /* EMIT SIGNAL */
+       
+       /* drop connections to signals */
+       
+       notify_callbacks ();
 }
 
 struct RegionSortByLayer {
@@ -128,12 +132,9 @@ MidiPlaylist::read (MidiRingBuffer& dst, nframes_t start,
 
        Glib::Mutex::Lock rm (region_lock);
 
-       nframes_t ret         = 0;
-       nframes_t end         = start + dur - 1;
-       //nframes_t read_frames = 0;
-       //nframes_t skip_frames = 0;
+       nframes_t end = start + dur - 1;
 
-       //_read_data_count = 0;
+       _read_data_count = 0;
 
        // relevent regions overlapping start <--> end
        vector<boost::shared_ptr<Region> > regs;
@@ -149,15 +150,14 @@ MidiPlaylist::read (MidiRingBuffer& dst, nframes_t start,
        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
+               // FIXME: ensure time is monotonic here?
                boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(*i);
-               mr->read_at (dst, start, dur, chan_n, 0, 0);// FIXME read_frames, skip_frames);
-               ret += mr->read_data_count();
+               if (mr) {
+                       mr->read_at (dst, start, dur, chan_n, _note_mode);
+                       _read_data_count += mr->read_data_count();
+               }
        }
 
-       _read_data_count += ret;
-       
-       //return ret; FIXME?
        return dur;
 }
 
@@ -165,105 +165,43 @@ MidiPlaylist::read (MidiRingBuffer& dst, nframes_t start,
 void
 MidiPlaylist::remove_dependents (boost::shared_ptr<Region> region)
 {
+       /* MIDI regions have no dependents (crossfades) */
 }
 
 
-void
-MidiPlaylist::flush_notifications ()
-{
-       Playlist::flush_notifications();
-
-       if (in_flush) {
-               return;
-       }
-
-       in_flush = true;
-
-       in_flush = false;
-}
-
 void
 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)
 {
-       throw; // I don't wanna
-       /*
-       MidiRegion *orig  = dynamic_cast<MidiRegion*>(o);
-       MidiRegion *left  = dynamic_cast<MidiRegion*>(l);
-       MidiRegion *right = dynamic_cast<MidiRegion*>(r);
-
-       for (Crossfades::iterator x = _crossfades.begin(); x != _crossfades.end();) {
-               Crossfades::iterator tmp;
-               tmp = x;
-               ++tmp;
-
-               Crossfade *fade = 0;
-
-               if ((*x)->_in == orig) {
-                       if (! (*x)->covers(right->position())) {
-                               fade = new Crossfade( *(*x), left, (*x)->_out);
-                       } else {
-                               // Overlap, the crossfade is copied on the left side of the right region instead
-                               fade = new Crossfade( *(*x), right, (*x)->_out);
-                       }
-               }
-
-               if ((*x)->_out == orig) {
-                       if (! (*x)->covers(right->position())) {
-                               fade = new Crossfade( *(*x), (*x)->_in, right);
-                       } else {
-                               // Overlap, the crossfade is copied on the right side of the left region instead
-                               fade = new Crossfade( *(*x), (*x)->_in, left);
-                       }
-               }
-
-               if (fade) {
-                       _crossfades.remove( (*x) );
-                       add_crossfade (*fade);
-               }
-               x = tmp;
-       }*/
+       /* No MIDI crossfading (yet?), so nothing to do here */
 }
 
 void
 MidiPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
 {
+       /* MIDI regions have no dependents (crossfades) */
 }
 
 
 int
 MidiPlaylist::set_state (const XMLNode& node)
 {
-       if (!in_set_state) {
-               Playlist::set_state (node);
-       }
-
-       // Actually Charles, I don't much care for children
-       
-       /*
-       XMLNodeList nlist = node.children();
+       in_set_state++;
+       freeze ();
 
-       for (XMLNodeConstIterator niter = nlist.begin(); niter != nlist.end(); ++niter) {
+       Playlist::set_state (node);
 
-               XMLNode* const child = *niter;
-
-       }*/
+       thaw();
+       in_set_state--;
 
        return 0;
 }
 
-XMLNode&
-MidiPlaylist::state (bool full_state)
-{
-       XMLNode& node = Playlist::state (full_state);
-
-       return node;
-}
-
 void
 MidiPlaylist::dump () const
 {