X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_playlist.cc;h=5402664ed1fcd3b045911d8e4af02a85cf47e6e8;hb=a4935eca6dcd4e66d24fe0aee04efc4beab1a059;hp=63c3b4985884134b664354a1cdf935d398912fe4;hpb=5d8021bf44c066ad9b5ee4e8ab824267824be738;p=ardour.git diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc index 63c3b49858..5402664ed1 100644 --- a/libs/ardour/midi_playlist.cc +++ b/libs/ardour/midi_playlist.cc @@ -17,21 +17,23 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include - #include +#include +#include #include #include -#include - #include "evoral/EventList.hpp" +#include "evoral/Control.hpp" +#include "ardour/beats_frames_converter.h" #include "ardour/debug.h" #include "ardour/midi_model.h" #include "ardour/midi_playlist.h" #include "ardour/midi_region.h" +#include "ardour/midi_source.h" #include "ardour/midi_state_tracker.h" +#include "ardour/session.h" #include "ardour/types.h" #include "i18n.h" @@ -43,9 +45,10 @@ using namespace std; MidiPlaylist::MidiPlaylist (Session& session, const XMLNode& node, bool hidden) : Playlist (session, node, DataType::MIDI, hidden) , _note_mode(Sustained) + , _read_end(0) { #ifndef NDEBUG - const XMLProperty* prop = node.property("type"); + XMLProperty const * prop = node.property("type"); assert(prop && DataType(prop->value()) == DataType::MIDI); #endif @@ -61,20 +64,26 @@ MidiPlaylist::MidiPlaylist (Session& session, const XMLNode& node, bool hidden) MidiPlaylist::MidiPlaylist (Session& session, string name, bool hidden) : Playlist (session, name, DataType::MIDI, hidden) , _note_mode(Sustained) + , _read_end(0) { } MidiPlaylist::MidiPlaylist (boost::shared_ptr other, string name, bool hidden) : Playlist (other, name, hidden) , _note_mode(other->_note_mode) + , _read_end(0) { } -MidiPlaylist::MidiPlaylist (boost::shared_ptr other, framepos_t start, framecnt_t dur, string name, bool hidden) +MidiPlaylist::MidiPlaylist (boost::shared_ptr other, + framepos_t start, + framecnt_t dur, + string name, + bool hidden) : Playlist (other, start, dur, name, hidden) , _note_mode(other->_note_mode) + , _read_end(0) { - /* this constructor does NOT notify others (session) */ } MidiPlaylist::~MidiPlaylist () @@ -97,40 +106,41 @@ struct EventsSortByTimeAndType { } }; -/** Returns the number of frames in time duration read (eg could be large when 0 events are read) */ framecnt_t -MidiPlaylist::read (Evoral::EventSink& dst, framepos_t start, framecnt_t dur, unsigned chan_n) +MidiPlaylist::read (Evoral::EventSink& dst, + framepos_t start, + framecnt_t dur, + unsigned chan_n, + MidiChannelFilter* filter) { - /* this function is never called from a realtime thread, so - its OK to block (for short intervals). - */ + typedef pair TrackerInfo; Playlist::RegionReadLock rl (this); - DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("++++++ %1 .. %2 +++++++ %3 trackers +++++++++++++++++\n", - start, start + dur, _note_trackers.size())); - - framepos_t end = start + dur - 1; + DEBUG_TRACE (DEBUG::MidiPlaylistIO, + string_compose ("---- MidiPlaylist::read %1 .. %2 (%3 trackers) ----\n", + start, start + dur, _note_trackers.size())); - // relevent regions overlapping start <--> end - vector< boost::shared_ptr > regs; - vector< boost::shared_ptr > ended; - typedef pair TrackerInfo; - vector tracker_info; - NoteTrackers::iterator t; + /* First, emit any queued edit fixup events at start. */ + for (NoteTrackers::iterator t = _note_trackers.begin(); t != _note_trackers.end(); ++t) { + t->second->fixer.emit(dst, _read_end, t->second->tracker); + } + /* Find relevant regions that overlap [start..end] */ + const framepos_t end = start + dur - 1; + std::vector< boost::shared_ptr > regs; + std::vector< boost::shared_ptr > ended; for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) { - - /* in this call to coverage, the return value indicates the - * overlap status of the read range (start...end) WRT to - * the region. - */ - switch ((*i)->coverage (start, end)) { case Evoral::OverlapStart: case Evoral::OverlapInternal: + regs.push_back (*i); + break; + case Evoral::OverlapExternal: + /* this region is entirely contained in the read range */ regs.push_back (*i); + ended.push_back (*i); break; case Evoral::OverlapEnd: @@ -138,153 +148,115 @@ MidiPlaylist::read (Evoral::EventSink& dst, framepos_t start, framec regs.push_back (*i); ended.push_back (*i); break; + default: /* we don't care */ break; } } - if (regs.size() == 1 && - (ended.empty() || (ended.size() == 1 && ended.front() == regs.front()))) { + /* If we are reading from a single region, we can read directly into dst. Otherwise, + we read into a temporarily list, sort it, then write that to dst. */ + const bool direct_read = regs.size() == 1 && + (ended.empty() || (ended.size() == 1 && ended.front() == regs.front())); - /* just a single region - read directly into dst */ + Evoral::EventList evlist; + Evoral::EventSink& tgt = direct_read ? dst : evlist; - DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("Single region (%1) read, ended during this read %2\n", regs.front()->name(), - ended.size())); + DEBUG_TRACE (DEBUG::MidiPlaylistIO, + string_compose ("\t%1 regions to read, direct: %2\n", regs.size(), direct_read)); - boost::shared_ptr mr = boost::dynamic_pointer_cast(regs.front()); - - if (mr) { - - NoteTrackers::iterator t = _note_trackers.find (mr.get()); - MidiStateTracker* tracker; - bool new_tracker = false; - - if (t == _note_trackers.end()) { - tracker = new MidiStateTracker; - new_tracker = true; - DEBUG_TRACE (DEBUG::MidiPlaylistIO, "\tBEFORE: new tracker\n"); - } else { - tracker = t->second; - DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\tBEFORE: tracker says there are %1 on notes\n", 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\n", tracker->on())); - - if (!ended.empty()) { - DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\t%1 ended in this read, resolve notes and delete (%2) tracker\n", - mr->name(), ((new_tracker) ? "new" : "old"))); - tracker->resolve_notes (dst, mr->last_frame()); - delete tracker; - if (!new_tracker) { - _note_trackers.erase (t); - } - } else { - if (new_tracker) { - pair newpair; - newpair.first = mr.get(); - newpair.second = tracker; - _note_trackers.insert (newpair); - DEBUG_TRACE (DEBUG::MidiPlaylistIO, "\tadded tracker to trackers\n"); - } - } + for (vector >::iterator i = regs.begin(); i != regs.end(); ++i) { + boost::shared_ptr mr = boost::dynamic_pointer_cast(*i); + if (!mr) { + continue; } - } else { - - /* 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 evlist; - - DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("for %1 .. %2 we have %3 to consider\n", start, start+dur-1, regs.size())); - - for (vector >::iterator i = regs.begin(); i != regs.end(); ++i) { - - boost::shared_ptr mr = boost::dynamic_pointer_cast(*i); + /* Get the existing note tracker for this region, or create a new one. */ + NoteTrackers::iterator t = _note_trackers.find (mr.get()); + bool new_tracker = false; + boost::shared_ptr tracker; + if (t == _note_trackers.end()) { + tracker = boost::shared_ptr(new RegionTracker); + new_tracker = true; + DEBUG_TRACE (DEBUG::MidiPlaylistIO, + string_compose ("\tPre-read %1 (%2 .. %3): new tracker\n", + mr->name(), mr->position(), mr->last_frame())); + } else { + tracker = t->second; + DEBUG_TRACE (DEBUG::MidiPlaylistIO, + string_compose ("\tPre-read %1 (%2 .. %3): %4 active notes\n", + mr->name(), mr->position(), mr->last_frame(), tracker->tracker.on())); + } - if (!mr) { - continue; + /* Read from region into target. */ + mr->read_at (tgt, start, dur, chan_n, _note_mode, &tracker->tracker, filter); + DEBUG_TRACE (DEBUG::MidiPlaylistIO, + string_compose ("\tPost-read: %1 active notes\n", tracker->tracker.on())); + + if (find (ended.begin(), ended.end(), *i) != ended.end()) { + /* Region ended within the read range, so resolve any active notes + (either stuck notes in the data, or notes that end after the end + of the region). */ + DEBUG_TRACE (DEBUG::MidiPlaylistIO, + string_compose ("\t%1 ended, resolve notes and delete (%2) tracker\n", + mr->name(), ((new_tracker) ? "new" : "old"))); + + tracker->tracker.resolve_notes (tgt, (*i)->last_frame()); + if (!new_tracker) { + _note_trackers.erase (t); } - NoteTrackers::iterator t = _note_trackers.find (mr.get()); - 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())); + } else { - if (t == _note_trackers.end()) { - tracker = new MidiStateTracker; - new_tracker = true; - DEBUG_TRACE (DEBUG::MidiPlaylistIO, "\tBEFORE: new tracker\n"); - } else { - tracker = t->second; - DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\tBEFORE: tracker says there are %1 on notes\n", tracker->on())); + if (new_tracker) { + _note_trackers.insert (make_pair (mr.get(), tracker)); + DEBUG_TRACE (DEBUG::MidiPlaylistIO, "\tadded tracker to trackers\n"); } + } + } + if (!direct_read && !evlist.empty()) { + /* We've read from multiple regions, sort the event list by time. */ + EventsSortByTimeAndType cmp; + evlist.sort (cmp); - mr->read_at (evlist, start, dur, chan_n, _note_mode, tracker); - -#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::iterator x = evlist.begin(); x != evlist.end(); ++x) { - 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 (find (ended.begin(), ended.end(), *i) != ended.end()) { - - /* the region ended within the read range, so - * resolve any dangling notes (i.e. notes whose - * end is beyond the end of the region). - */ - - DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\t%1 ended in this read, resolve notes and delete (%2) tracker\n", - mr->name(), ((new_tracker) ? "new" : "old"))); - - tracker->resolve_notes (evlist, (*i)->last_frame()); - delete tracker; - if (!new_tracker) { - _note_trackers.erase (t); - } - - } else { - - if (new_tracker) { - _note_trackers.insert (make_pair (mr.get(), tracker)); - DEBUG_TRACE (DEBUG::MidiPlaylistIO, "\tadded tracker to trackers\n"); - } - } + /* Copy ordered events from event list to dst. */ + for (Evoral::EventList::iterator e = evlist.begin(); e != evlist.end(); ++e) { + Evoral::Event* ev (*e); + dst.write (ev->time(), ev->event_type(), ev->size(), ev->buffer()); + delete ev; } + } - if (!evlist.empty()) { + DEBUG_TRACE (DEBUG::MidiPlaylistIO, "---- End MidiPlaylist::read ----\n"); + _read_end = start + dur; + return dur; +} - /* sort the event list */ - EventsSortByTimeAndType cmp; - evlist.sort (cmp); +void +MidiPlaylist::region_edited(boost::shared_ptr region, + const MidiModel::NoteDiffCommand* cmd) +{ + typedef MidiModel::NoteDiffCommand Command; -#ifndef NDEBUG - DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("Final we now have %1 events\n", evlist.size())); - for (Evoral::EventList::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::iterator e = evlist.begin(); e != evlist.end(); ++e) { - Evoral::Event* ev (*e); - dst.write (ev->time(), ev->event_type(), ev->size(), ev->buffer()); - delete ev; - } + boost::shared_ptr mr = boost::dynamic_pointer_cast(region); + if (!mr || !_session.transport_rolling()) { + return; + } - } + /* Take write lock to prevent concurrency with read(). */ + Playlist::RegionWriteLock lock(this); + + NoteTrackers::iterator t = _note_trackers.find(mr.get()); + if (t == _note_trackers.end()) { + return; /* Region is not currently active, nothing to do. */ } - DEBUG_TRACE (DEBUG::MidiPlaylistIO, "-------------------------------------------------------------\n"); - return dur; + /* Queue any necessary edit compensation events. */ + t->second->fixer.prepare( + _session.tempo_map(), cmd, mr->position() - mr->start(), + _read_end, mr->midi_source()->model()->active_notes()); } void @@ -292,9 +264,6 @@ MidiPlaylist::reset_note_trackers () { Playlist::RegionWriteLock rl (this, false); - for (NoteTrackers::iterator n = _note_trackers.begin(); n != _note_trackers.end(); ++n) { - delete n->second; - } DEBUG_TRACE (DEBUG::MidiTrackers, string_compose ("%1 reset all note trackers\n", name())); _note_trackers.clear (); } @@ -305,8 +274,7 @@ MidiPlaylist::resolve_note_trackers (Evoral::EventSink& dst, framepo Playlist::RegionWriteLock rl (this, false); for (NoteTrackers::iterator n = _note_trackers.begin(); n != _note_trackers.end(); ++n) { - n->second->resolve_notes(dst, time); - delete n->second; + n->second->tracker.resolve_notes(dst, time); } DEBUG_TRACE (DEBUG::MidiTrackers, string_compose ("%1 resolve all note trackers\n", name())); _note_trackers.clear (); @@ -316,14 +284,7 @@ void MidiPlaylist::remove_dependents (boost::shared_ptr region) { /* 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); - } + _note_trackers.erase(region.get()); } int @@ -417,30 +378,11 @@ MidiPlaylist::contained_automation() for (Automatable::Controls::iterator c = mr->model()->controls().begin(); c != mr->model()->controls().end(); ++c) { - ret.insert(c->first); + if (c->second->list()->size() > 0) { + ret.insert(c->first); + } } } return ret; } - - -bool -MidiPlaylist::region_changed (const PBD::PropertyChange& what_changed, boost::shared_ptr region) -{ - if (in_flush || in_set_state) { - return false; - } - - PBD::PropertyChange our_interests; - our_interests.add (Properties::midi_data); - - bool parent_wants_notify = Playlist::region_changed (what_changed, region); - - if (parent_wants_notify || what_changed.contains (our_interests)) { - notify_contents_changed (); - } - - return true; -} -