X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_playlist.cc;h=39d964a7532d7afc5a8c4565bba4455bb054aaab;hb=81bff2edee31ad64693d5be3c06558714ea92722;hp=9b0eb374d5f1f6dc72219451856486f2c513d866;hpb=a2897ecef6da6a458aa1de8c2d9973a1e809dca2;p=ardour.git

diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc
index 9b0eb374d5..39d964a753 100644
--- a/libs/ardour/midi_playlist.cc
+++ b/libs/ardour/midi_playlist.cc
@@ -17,27 +17,28 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <cassert>
-
 #include <algorithm>
+#include <cassert>
+#include <cstdlib>
 #include <iostream>
-
-#include <stdlib.h>
-
-#include "pbd/error.h"
+#include <utility>
 
 #include "evoral/EventList.hpp"
+#include "evoral/Control.hpp"
 
-#include "ardour/configuration.h"
+#include "ardour/beats_samples_converter.h"
 #include "ardour/debug.h"
 #include "ardour/midi_model.h"
 #include "ardour/midi_playlist.h"
 #include "ardour/midi_region.h"
-#include "ardour/midi_ring_buffer.h"
+#include "ardour/midi_source.h"
+#include "ardour/midi_state_tracker.h"
+#include "ardour/region_factory.h"
 #include "ardour/session.h"
+#include "ardour/tempo.h"
 #include "ardour/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
@@ -46,9 +47,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
 
@@ -64,20 +66,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<const MidiPlaylist> other, string name, bool hidden)
 	: Playlist (other, name, hidden)
 	, _note_mode(other->_note_mode)
+	, _read_end(0)
 {
 }
 
-MidiPlaylist::MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other, framepos_t start, framecnt_t dur, string name, bool hidden)
+MidiPlaylist::MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other,
+                            samplepos_t                            start,
+                            samplecnt_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 ()
@@ -86,9 +94,10 @@ MidiPlaylist::~MidiPlaylist ()
 
 template<typename Time>
 struct EventsSortByTimeAndType {
-    bool operator() (Evoral::Event<Time>* a, Evoral::Event<Time>* b) {
+    bool operator() (const Evoral::Event<Time>* a, const Evoral::Event<Time>* b) {
 	    if (a->time() == b->time()) {
-		    if (EventTypeMap::instance().type_is_midi (a->event_type()) && EventTypeMap::instance().type_is_midi (b->event_type())) {
+		    if (parameter_is_midi ((AutomationType)a->event_type()) &&
+		        parameter_is_midi ((AutomationType)b->event_type())) {
 			    /* negate return value since we must return whether
 			     * or not a should sort before b, not b before a
 			     */
@@ -99,39 +108,48 @@ 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<framepos_t>& dst, framepos_t start, framecnt_t dur, unsigned chan_n)
+samplecnt_t
+MidiPlaylist::read (Evoral::EventSink<samplepos_t>& dst,
+                    samplepos_t                     start,
+                    samplecnt_t                     dur,
+                    Evoral::Range<samplepos_t>*     loop_range,
+                    unsigned                       chan_n,
+                    MidiChannelFilter*             filter)
 {
-	/* this function is never called from a realtime thread, so
-	   its OK to block (for short intervals).
-	*/
+	typedef pair<MidiStateTracker*,samplepos_t> TrackerInfo;
 
-	Glib::RecMutex::Lock rm (region_lock);
-	DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("++++++ %1 .. %2  +++++++ %3 trackers +++++++++++++++++\n", 
-							    start, start + dur, _note_trackers.size()));
+	Playlist::RegionReadLock rl (this);
 
-	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<Region> > regs;
-	vector< boost::shared_ptr<Region> > ended;
-	typedef pair<MidiStateTracker*,framepos_t> TrackerInfo;
-	vector<TrackerInfo> 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 samplepos_t                         end = start + dur - 1;
+	std::vector< boost::shared_ptr<Region> > regs;
+	std::vector< boost::shared_ptr<Region> > 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.
-		 */
+		/* check for the case of solo_selection */
+		bool force_transparent = ( _session.solo_selection_active() && SoloSelectedActive() && !SoloSelectedListIncludes( (const Region*) &(**i) ) );
+		if ( force_transparent )
+			continue;
 
 		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:
@@ -139,166 +157,140 @@ MidiPlaylist::read (Evoral::EventSink<framepos_t>& 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()))) {
-
-		/* just a single region - read directly into dst */
-
-		DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("Single region (%1) read, ended during this read %2\n", regs.front()->name(),
-								    ended.size()));
-
-		boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(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()));
 
-		if (mr) {
+	Evoral::EventList<samplepos_t>  evlist;
+	Evoral::EventSink<samplepos_t>& tgt = direct_read ? dst : evlist;
 
-			NoteTrackers::iterator t = _note_trackers.find (mr.get());
-			MidiStateTracker* tracker;
-			bool new_tracker = false;
+	DEBUG_TRACE (DEBUG::MidiPlaylistIO,
+	             string_compose ("\t%1 regions to read, direct: %2\n", regs.size(), direct_read));
 
-			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<Region*,MidiStateTracker*> newpair;
-					newpair.first = mr.get();
-					newpair.second = tracker;
-					_note_trackers.insert (newpair);
-					DEBUG_TRACE (DEBUG::MidiPlaylistIO, "\tadded tracker to trackers\n");
-				}
-			}
+	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) {
+			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<framepos_t> evlist;
-
-		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);
+		/* 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<RegionTracker> tracker;
+		if (t == _note_trackers.end()) {
+			tracker     = boost::shared_ptr<RegionTracker>(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_sample()));
+		} 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_sample(), tracker->tracker.on()));
+		}
 
-			if (!mr) {
-				continue;
+		/* Read from region into target. */
+		DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("read from %1 at %2 for %3 LR %4 .. %5\n",
+		                                                    mr->name(), start, dur, 
+		                                                    (loop_range ? loop_range->from : -1),
+		                                                    (loop_range ? loop_range->to : -1)));
+		mr->read_at (tgt, start, dur, loop_range, tracker->cursor, 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, loop_range ? loop_range->squish ((*i)->last_sample()) : (*i)->last_sample());
+			tracker->cursor.invalidate (false);
+			if (!new_tracker) {
+				_note_trackers.erase (t);
 			}
 
-			NoteTrackers::iterator t = _note_trackers.find (mr.get());
-			MidiStateTracker* tracker;
-			bool new_tracker = false;
+		} else {
 
-			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()) {
-				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<samplepos_t> 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<framepos_t>::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) {
-					pair<Region*,MidiStateTracker*> newpair;
-					newpair.first = mr.get();
-					newpair.second = tracker;
-					_note_trackers.insert (newpair).first;
-					DEBUG_TRACE (DEBUG::MidiPlaylistIO, "\tadded tracker to trackers\n");
-				}
-			}
+		/* Copy ordered events from event list to dst. */
+		for (Evoral::EventList<samplepos_t>::iterator e = evlist.begin(); e != evlist.end(); ++e) {
+			Evoral::Event<samplepos_t>* ev (*e);
+			dst.write (ev->time(), ev->event_type(), ev->size(), ev->buffer());
+			delete ev;
 		}
+	}
+
+	DEBUG_TRACE (DEBUG::MidiPlaylistIO, "---- End MidiPlaylist::read ----\n");
+	_read_end = start + dur;
+	return dur;
+}
 
-		if (!evlist.empty()) {
+void
+MidiPlaylist::region_edited(boost::shared_ptr<Region>         region,
+                            const MidiModel::NoteDiffCommand* cmd)
+{
+	typedef MidiModel::NoteDiffCommand Command;
 
-			/* sort the event list */
-			EventsSortByTimeAndType<framepos_t> cmp;
-			evlist.sort (cmp);
+	boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(region);
+	if (!mr || !_session.transport_rolling()) {
+		return;
+	}
 
-#ifndef NDEBUG
-			DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("Final we now have %1 events\n",  evlist.size()));
-			for (Evoral::EventList<framepos_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<framepos_t>::iterator e = evlist.begin(); e != evlist.end(); ++e) {
-				Evoral::Event<framepos_t>* ev (*e);
-				dst.write (ev->time(), ev->event_type(), ev->size(), ev->buffer());
-				delete ev;
-			}
+	/* 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, t->second->cursor.active_notes);
+}
+
+void
+MidiPlaylist::reset_note_trackers ()
+{
+	Playlist::RegionWriteLock rl (this, false);
+
+	DEBUG_TRACE (DEBUG::MidiTrackers, string_compose ("%1 reset all note trackers\n", name()));
+	_note_trackers.clear ();
 }
 
 void
-MidiPlaylist::clear_note_trackers ()
+MidiPlaylist::resolve_note_trackers (Evoral::EventSink<samplepos_t>& dst, samplepos_t time)
 {
-	Glib::RecMutex::Lock rm (region_lock);
+	Playlist::RegionWriteLock rl (this, false);
+
 	for (NoteTrackers::iterator n = _note_trackers.begin(); n != _note_trackers.end(); ++n) {
-		delete n->second;
+		n->second->tracker.resolve_notes(dst, time);
 	}
-	DEBUG_TRACE (DEBUG::MidiTrackers, string_compose ("%1 clears all note trackers\n", name()));
+	DEBUG_TRACE (DEBUG::MidiTrackers, string_compose ("%1 resolve all note trackers\n", name()));
 	_note_trackers.clear ();
 }
 
@@ -306,13 +298,15 @@ void
 MidiPlaylist::remove_dependents (boost::shared_ptr<Region> region)
 {
 	/* MIDI regions have no dependents (crossfades) but we might be tracking notes */
-	NoteTrackers::iterator t = _note_trackers.find (region.get());
-
-	/* GACK! THREAD SAFETY! */
+	_note_trackers.erase(region.get());
+}
 
-	if (t != _note_trackers.end()) {
-		delete t->second;
-		_note_trackers.erase (t);
+void
+MidiPlaylist::region_going_away (boost::weak_ptr<Region> region)
+{
+	boost::shared_ptr<Region> r = region.lock();
+	if (r) {
+		remove_dependents(r);
 	}
 }
 
@@ -365,7 +359,7 @@ MidiPlaylist::destroy_region (boost::shared_ptr<Region> region)
 	bool changed = false;
 
 	{
-		RegionLock rlock (this);
+		RegionWriteLock rlock (this);
 		RegionList::iterator i;
 		RegionList::iterator tmp;
 
@@ -381,8 +375,12 @@ MidiPlaylist::destroy_region (boost::shared_ptr<Region> region)
 
 			i = tmp;
 		}
-	}
 
+		NoteTrackers::iterator t = _note_trackers.find(region.get());
+		if (t != _note_trackers.end()) {
+			_note_trackers.erase(t);
+		}
+	}
 
 	if (changed) {
 		/* overload this, it normally means "removed", not destroyed */
@@ -391,6 +389,80 @@ MidiPlaylist::destroy_region (boost::shared_ptr<Region> region)
 
 	return changed;
 }
+void
+MidiPlaylist::_split_region (boost::shared_ptr<Region> region, const MusicSample& playlist_position)
+{
+	if (!region->covers (playlist_position.sample)) {
+		return;
+	}
+
+	if (region->position() == playlist_position.sample ||
+	    region->last_sample() == playlist_position.sample) {
+		return;
+	}
+
+	boost::shared_ptr<const MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(region);
+
+	if (mr == 0) {
+		return;
+	}
+
+	boost::shared_ptr<Region> left;
+	boost::shared_ptr<Region> right;
+
+	string before_name;
+	string after_name;
+	const double before_qn = _session.tempo_map().exact_qn_at_sample (playlist_position.sample, playlist_position.division) - region->quarter_note();
+	const double after_qn = mr->length_beats() - before_qn;
+	MusicSample before (playlist_position.sample - region->position(), playlist_position.division);
+	MusicSample after (region->length() - before.sample, playlist_position.division);
+
+	/* split doesn't change anything about length, so don't try to splice */
+	bool old_sp = _splicing;
+	_splicing = true;
+
+	RegionFactory::region_name (before_name, region->name(), false);
+
+	{
+		PropertyList plist;
+
+		plist.add (Properties::length, before.sample);
+		plist.add (Properties::length_beats, before_qn);
+		plist.add (Properties::name, before_name);
+		plist.add (Properties::left_of_split, true);
+		plist.add (Properties::layering_index, region->layering_index ());
+		plist.add (Properties::layer, region->layer ());
+
+		/* note: we must use the version of ::create with an offset here,
+		   since it supplies that offset to the Region constructor, which
+		   is necessary to get audio region gain envelopes right.
+		*/
+		left = RegionFactory::create (region, MusicSample (0, 0), plist, true);
+	}
+
+	RegionFactory::region_name (after_name, region->name(), false);
+
+	{
+		PropertyList plist;
+
+		plist.add (Properties::length, after.sample);
+		plist.add (Properties::length_beats, after_qn);
+		plist.add (Properties::name, after_name);
+		plist.add (Properties::right_of_split, true);
+		plist.add (Properties::layering_index, region->layering_index ());
+		plist.add (Properties::layer, region->layer ());
+
+		/* same note as above */
+		right = RegionFactory::create (region, before, plist, true);
+	}
+
+	add_region_internal (left, region->position(), 0, region->quarter_note(), true);
+	add_region_internal (right, region->position() + before.sample, before.division, region->quarter_note() + before_qn, true);
+
+	remove_region_internal (region);
+
+	_splicing = old_sp;
+}
 
 set<Evoral::Parameter>
 MidiPlaylist::contained_automation()
@@ -399,8 +471,7 @@ MidiPlaylist::contained_automation()
 	   its OK to block (for short intervals).
 	*/
 
-	Glib::RecMutex::Lock rm (region_lock);
-
+	Playlist::RegionReadLock rl (this);
 	set<Evoral::Parameter> ret;
 
 	for (RegionList::const_iterator r = regions.begin(); r != regions.end(); ++r) {
@@ -408,30 +479,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> 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;
-}
-