slightly improved fixes for MIDI issues

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

diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc
index b2318bbe96257e74ef3135f288fe155902093259..27410462d1b85a3ed6778a4c6cabf33f87b99ea1 100644 (file)
--- a/libs/ardour/midi_playlist.cc
+++ b/libs/ardour/midi_playlist.cc
@@ -46,25 +46,17 @@ 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;
-
-       if (!hidden) {
-               PlaylistCreated (this); /* EMIT SIGNAL */
-       }
+       in_set_state--;
 }
 
 MidiPlaylist::MidiPlaylist (Session& session, string name, bool hidden)
                : Playlist (session, name, DataType::MIDI, hidden)
 {
-       if (!hidden) {
-               PlaylistCreated (this); /* EMIT SIGNAL */
-       }
-
 }
 
-MidiPlaylist::MidiPlaylist (const MidiPlaylist& other, string name, bool hidden)
+MidiPlaylist::MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other, string name, bool hidden)
                : Playlist (other, name, hidden)
 {
        throw; // nope
@@ -106,12 +98,9 @@ MidiPlaylist::MidiPlaylist (const MidiPlaylist& other, string name, bool hidden)
                in_n++;
        }
 */
-       if (!hidden) {
-               PlaylistCreated (this); /* EMIT SIGNAL */
-       }
 }
 
-MidiPlaylist::MidiPlaylist (const MidiPlaylist& other, jack_nframes_t start, jack_nframes_t dur, string name, bool hidden)
+MidiPlaylist::MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other, nframes_t start, nframes_t dur, string name, bool hidden)
                : Playlist (other, start, dur, name, hidden)
 {
        /* this constructor does NOT notify others (session) */
@@ -120,6 +109,10 @@ MidiPlaylist::MidiPlaylist (const MidiPlaylist& other, jack_nframes_t start, jac
 MidiPlaylist::~MidiPlaylist ()
 {
        GoingAway (); /* EMIT SIGNAL */
+       
+       /* drop connections to signals */
+       
+       notify_callbacks ();
 }
 
 struct RegionSortByLayer {
@@ -129,9 +122,9 @@ struct RegionSortByLayer {
 };
 
 /** Returns the number of frames in time duration read (eg could be large when 0 events are read) */
-jack_nframes_t
-MidiPlaylist::read (MidiRingBuffer& dst, jack_nframes_t start,
-                     jack_nframes_t dur, unsigned chan_n)
+nframes_t
+MidiPlaylist::read (MidiRingBuffer& dst, nframes_t start,
+                     nframes_t dur, unsigned chan_n)
 {
        /* this function is never called from a realtime thread, so
           its OK to block (for short intervals).
@@ -139,12 +132,9 @@ MidiPlaylist::read (MidiRingBuffer& dst, jack_nframes_t start,
 
        Glib::Mutex::Lock rm (region_lock);
 
-       jack_nframes_t ret         = 0;
-       jack_nframes_t end         = start + dur - 1;
-       //jack_nframes_t read_frames = 0;
-       //jack_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;
@@ -160,15 +150,14 @@ MidiPlaylist::read (MidiRingBuffer& dst, jack_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;
 }
 
@@ -176,26 +165,14 @@ MidiPlaylist::read (MidiRingBuffer& dst, jack_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
@@ -243,38 +220,24 @@ MidiPlaylist::finalize_split_region (boost::shared_ptr<Region> original, boost::
 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
 {