continue with MTC debugging
[ardour.git] / libs / ardour / midi_playlist.cc
index d02079c7157dd576057f0a03168cd7444de4b4c7..a1fb01a7bb859702f2a6488c645653de77c906d1 100644 (file)
@@ -44,8 +44,8 @@ using namespace sigc;
 using namespace std;
 
 MidiPlaylist::MidiPlaylist (Session& session, const XMLNode& node, bool hidden)
-               : Playlist (session, node, DataType::MIDI, hidden)
-               , _note_mode(Sustained)
+       : Playlist (session, node, DataType::MIDI, hidden)
+       , _note_mode(Sustained)
 {
        const XMLProperty* prop = node.property("type");
        assert(prop && DataType(prop->value()) == DataType::MIDI);
@@ -56,52 +56,13 @@ MidiPlaylist::MidiPlaylist (Session& session, const XMLNode& node, bool hidden)
 }
 
 MidiPlaylist::MidiPlaylist (Session& session, string name, bool hidden)
-               : Playlist (session, name, DataType::MIDI, hidden)
+       : Playlist (session, name, DataType::MIDI, hidden)
 {
 }
 
 MidiPlaylist::MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other, string name, bool hidden)
-               : Playlist (other, name, hidden)
+       : Playlist (other, name, hidden)
 {
-       throw; // nope
-
-       /*
-       list<Region*>::const_iterator in_o  = other.regions.begin();
-       list<Region*>::iterator in_n = regions.begin();
-
-       while (in_o != other.regions.end()) {
-               MidiRegion *ar = dynamic_cast<MidiRegion *>( (*in_o) );
-
-               for (list<Crossfade *>::const_iterator xfades = other._crossfades.begin(); xfades != other._crossfades.end(); ++xfades) {
-                       if ( &(*xfades)->in() == ar) {
-                               // We found one! Now copy it!
-
-                               list<Region*>::const_iterator out_o = other.regions.begin();
-                               list<Region*>::const_iterator out_n = regions.begin();
-
-                               while (out_o != other.regions.end()) {
-
-                                       MidiRegion *ar2 = dynamic_cast<MidiRegion *>( (*out_o) );
-
-                                       if ( &(*xfades)->out() == ar2) {
-                                               MidiRegion *in  = dynamic_cast<MidiRegion*>( (*in_n) );
-                                               MidiRegion *out = dynamic_cast<MidiRegion*>( (*out_n) );
-                                               Crossfade *new_fade = new Crossfade( *(*xfades), in, out);
-                                               add_crossfade(*new_fade);
-                                               break;
-                                       }
-
-                                       out_o++;
-                                       out_n++;
-                               }
-                               // cerr << "HUH!? second region in the crossfade not found!" << endl;
-                       }
-               }
-
-               in_o++;
-               in_n++;
-       }
-*/
 }
 
 MidiPlaylist::MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other, nframes_t start, nframes_t dur, string name, bool hidden)
@@ -119,12 +80,6 @@ MidiPlaylist::~MidiPlaylist ()
        notify_callbacks ();
 }
 
-struct RegionSortByLayer {
-    bool operator() (boost::shared_ptr<Region> a, boost::shared_ptr<Region> b) {
-           return a->layer() < b->layer();
-    }
-};
-
 template<typename Time>
 struct EventsSortByTime {
     bool operator() (Evoral::Event<Time>* a, Evoral::Event<Time>* b) {
@@ -161,12 +116,21 @@ MidiPlaylist::read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t d
                        if (t != _note_trackers.end()) {
 
                                /* add it the set of trackers we will do note resolution
-                                  on, and remove it from the list we are keeping 
+                                  on, and remove it from the list we are keeping
                                   around, because we don't need it anymore.
+
+                                  if the end of the region (where we want to theoretically resolve notes)
+                                  is outside the current read range, then just do it at the start
+                                  of this read range.
                                */
-                               
-                               tracker_info.push_back (TrackerInfo (t->second, (*i)->last_frame()));
-                               DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("time to resolve & remove tracker for %1\n", (*i)->name()));
+
+                               nframes64_t resolve_at = (*i)->last_frame();
+                               if (resolve_at >= end) {
+                                       resolve_at = start;
+                               }
+
+                               tracker_info.push_back (TrackerInfo (t->second, resolve_at));
+                               DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("time to resolve & remove tracker for %1 @ %2\n", (*i)->name(), resolve_at));
                                note_cnt += (t->second->on());
                                _note_trackers.erase (t);
                        }
@@ -181,13 +145,13 @@ MidiPlaylist::read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t d
                }
                tracker_info.clear ();
        }
-                       
+
        if (regs.size() == 1 && tracker_info.empty()) {
-       
+
                /* just a single region - read directly into dst */
 
                DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("Single region (%1) read, no out-of-bound region tracking info\n", regs.front()->name()));
-               
+
                boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(regs.front());
 
                if (mr) {
@@ -204,10 +168,10 @@ MidiPlaylist::read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t d
                                tracker = t->second;
                                DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\tBEFORE: tracker says there are %1 on notes", tracker->on()));
                        }
-                       
+
                        mr->read_at (dst, start, dur, chan_n, _note_mode, tracker);
                        DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\tAFTER: tracker says there are %1 on notes", tracker->on()));
-                       
+
                        if (new_tracker) {
                                pair<Region*,MidiStateTracker*> newpair;
                                newpair.first = mr.get();
@@ -218,15 +182,15 @@ MidiPlaylist::read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t d
 
                        _read_data_count += mr->read_data_count();
                }
-               
+
        } else {
 
-               /* multiple regions and/or note resolution: sort by layer, read into a temporary non-monotonically 
+               /* multiple regions and/or note resolution: sort by layer, read into a temporary non-monotonically
                   sorted EventSink, sort and then insert into dst.
                */
 
                DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("%1 regions to read, plus %2 trackers\n", regs.size(), tracker_info.size()));
-               
+
                Evoral::EventList<nframes_t> evlist;
 
                for (vector<TrackerInfo>::iterator t = tracker_info.begin(); t != tracker_info.end(); ++t) {
@@ -234,18 +198,16 @@ MidiPlaylist::read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t d
                        (*t).first->resolve_notes (evlist, (*t).second);
                        delete (*t).first;
                }
-               
+
+#ifndef NDEBUG
                DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("After resolution we now have %1 events\n",  evlist.size()));
                for (Evoral::EventList<nframes_t>::iterator x = evlist.begin(); x != evlist.end(); ++x) {
-                       DEBUG_STR_SET(a,**x);
-                       DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\t%1\n", DEBUG_STR(a)));
-               }                       
-               
-               RegionSortByLayer layer_cmp;
-               sort(regs.begin(), regs.end(), layer_cmp);
-               
+                       DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\t%1\n", **x));
+               }
+#endif
+
                DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("for %1 .. %2 we have %3 to consider\n", start, start+dur-1, regs.size()));
-               
+
                for (vector<boost::shared_ptr<Region> >::iterator i = regs.begin(); i != regs.end(); ++i) {
                        boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(*i);
                        if (!mr) {
@@ -256,7 +218,7 @@ MidiPlaylist::read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t d
                        MidiStateTracker* tracker;
                        bool new_tracker = false;
 
-                       
+
                        DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("Before %1 (%2 .. %3) we now have %4 events\n", mr->name(), mr->position(), mr->last_frame(), evlist.size()));
 
                        if (t == _note_trackers.end()) {
@@ -268,16 +230,17 @@ MidiPlaylist::read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t d
                                DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\tBEFORE: tracker says there are %1 on notes\n", tracker->on()));
                        }
 
-                               
+
                        mr->read_at (evlist, start, dur, chan_n, _note_mode, tracker);
                        _read_data_count += mr->read_data_count();
 
+#ifndef NDEBUG
                        DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("After %1 (%2 .. %3) we now have %4\n", mr->name(), mr->position(), mr->last_frame(), evlist.size()));
                        for (Evoral::EventList<nframes_t>::iterator x = evlist.begin(); x != evlist.end(); ++x) {
-                               DEBUG_STR_SET(a,**x);
-                               DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\t%1\n", DEBUG_STR(a)));
-                       }                       
+                               DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\t%1\n", **x));
+                       }
                        DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\tAFTER: tracker says there are %1 on notes\n", tracker->on()));
+#endif
 
                        if (new_tracker) {
                                pair<Region*,MidiStateTracker*> newpair;
@@ -285,27 +248,28 @@ MidiPlaylist::read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t d
                                newpair.second = tracker;
                                _note_trackers.insert (newpair);
                                DEBUG_TRACE (DEBUG::MidiPlaylistIO, "\tadded tracker to trackers\n");
-                       } 
+                       }
                }
 
-               DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("Final we now have %1 events\n",  evlist.size()));
-               for (Evoral::EventList<nframes_t>::iterator x = evlist.begin(); x != evlist.end(); ++x) {
-                       DEBUG_STR_SET(a,**x);
-                       DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\t%1\n", DEBUG_STR(a)));
-               }                       
-               
                if (!evlist.empty()) {
-               
+
                        /* sort the event list */
                        EventsSortByTime<nframes_t> time_cmp;
                        evlist.sort (time_cmp);
-                       
+
+#ifndef NDEBUG
+                       DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("Final we now have %1 events\n",  evlist.size()));
+                       for (Evoral::EventList<nframes_t>::iterator x = evlist.begin(); x != evlist.end(); ++x) {
+                               DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\t%1\n", **x));
+                       }
+#endif
                        /* write into dst */
                        for (Evoral::EventList<nframes_t>::iterator e = evlist.begin(); e != evlist.end(); ++e) {
                                Evoral::Event<nframes_t>* ev (*e);
                                dst.write (ev->time(), ev->event_type(), ev->size(), ev->buffer());
                                delete ev;
                        }
+
                }
        }
 
@@ -313,6 +277,16 @@ MidiPlaylist::read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t d
        return dur;
 }
 
+void
+MidiPlaylist::clear_note_trackers ()
+{
+       Glib::RecMutex::Lock rm (region_lock);
+       for (NoteTrackers::iterator n = _note_trackers.begin(); n != _note_trackers.end(); ++n) {
+               delete n->second;
+       }
+       _note_trackers.clear ();
+}
+
 void
 MidiPlaylist::remove_dependents (boost::shared_ptr<Region> region)
 {