X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_playlist.cc;h=6f5dee979a7e676901a6822008d0a43010f2ce89;hb=4d112a8e6b90fa64a5cd333042044768111ba994;hp=cc72a630bad96ec6070794fb503a307554938a76;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc
index cc72a630ba..6f5dee979a 100644
--- a/libs/ardour/midi_playlist.cc
+++ b/libs/ardour/midi_playlist.cc
@@ -20,11 +20,13 @@
 #include <cassert>
 
 #include <algorithm>
+#include <iostream>
 
 #include <stdlib.h>
 
-#include <sigc++/bind.h>
+#include "evoral/EventList.hpp"
 
+#include "ardour/debug.h"
 #include "ardour/types.h"
 #include "ardour/configuration.h"
 #include "ardour/midi_playlist.h"
@@ -37,88 +39,50 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
-using namespace sigc;
+using namespace PBD;
 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)
 {
+#ifndef NDEBUG
 	const XMLProperty* prop = node.property("type");
 	assert(prop && DataType(prop->value()) == DataType::MIDI);
+#endif
 
 	in_set_state++;
-	set_state (node);
+	set_state (node, Stateful::loading_state_version);
 	in_set_state--;
 }
 
 MidiPlaylist::MidiPlaylist (Session& session, string name, bool hidden)
-		: Playlist (session, name, DataType::MIDI, hidden)
+	: Playlist (session, name, DataType::MIDI, hidden)
+	, _note_mode(Sustained)
 {
 }
 
 MidiPlaylist::MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other, string name, bool hidden)
-		: Playlist (other, name, hidden)
+	: Playlist (other, name, hidden)
+	, _note_mode(other->_note_mode)
 {
-	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)
-		: Playlist (other, start, dur, name, hidden)
+	: Playlist (other, start, dur, name, hidden)
+	, _note_mode(other->_note_mode)
 {
 	/* this constructor does NOT notify others (session) */
 }
 
 MidiPlaylist::~MidiPlaylist ()
 {
-	GoingAway (); /* EMIT SIGNAL */
-
-	/* drop connections to signals */
-
-	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) {
+	    return a->time() < b->time();
     }
 };
 
@@ -131,39 +95,209 @@ MidiPlaylist::read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t d
 	*/
 
 	Glib::RecMutex::Lock rm (region_lock);
+	DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("++++++ %1 .. %2  +++++++++++++++++++++++++++++++++++++++++++++++\n", start, start + dur));
 
 	nframes_t end = start + dur - 1;
 
 	_read_data_count = 0;
 
 	// relevent regions overlapping start <--> end
-	vector<boost::shared_ptr<Region> > regs;
+	vector< boost::shared_ptr<Region> > regs;
+	typedef pair<MidiStateTracker*,nframes64_t> TrackerInfo;
+	vector<TrackerInfo> tracker_info;
+	uint32_t note_cnt = 0;
 
 	for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
 		if ((*i)->coverage (start, end) != OverlapNone) {
 			regs.push_back(*i);
+		} else {
+			NoteTrackers::iterator t = _note_trackers.find ((*i).get());
+			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
+				   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.
+				*/
+
+				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);
+			}
 		}
 	}
 
-	RegionSortByLayer layer_cmp;
-	sort(regs.begin(), regs.end(), layer_cmp);
+	if (note_cnt == 0 && !tracker_info.empty()) {
+		/* trackers to dispose of, but they have no notes in them */
+		DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("Clearing %1 empty trackers\n", tracker_info.size()));
+		for (vector<TrackerInfo>::iterator t = tracker_info.begin(); t != tracker_info.end(); ++t) {
+			delete (*t).first;
+		}
+		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());
 
-	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) {
-			mr->read_at (dst, start, dur, chan_n, _note_mode);
+
+			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 (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");
+			}
+
+			_read_data_count += mr->read_data_count();
+		}
+
+	} 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<nframes_t> evlist;
+
+		for (vector<TrackerInfo>::iterator t = tracker_info.begin(); t != tracker_info.end(); ++t) {
+			DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("Resolve %1 notes\n", (*t).first->on()));
+			(*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_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) {
+				continue;
+			}
+
+			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()));
+
+			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 (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_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;
+				newpair.first = mr.get();
+				newpair.second = tracker;
+				_note_trackers.insert (newpair);
+				DEBUG_TRACE (DEBUG::MidiPlaylistIO, "\tadded tracker to trackers\n");
+			}
+		}
+
+		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;
+			}
+
 		}
 	}
 
+	DEBUG_TRACE (DEBUG::MidiPlaylistIO, "-------------------------------------------------------------\n");
 	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*/)
+MidiPlaylist::remove_dependents (boost::shared_ptr<Region> region)
 {
-	/* MIDI regions have no dependents (crossfades) */
+	/* 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);
+	}
 }
 
 
@@ -187,12 +321,12 @@ MidiPlaylist::check_dependents (boost::shared_ptr<Region> /*r*/, bool /*norefres
 
 
 int
-MidiPlaylist::set_state (const XMLNode& node)
+MidiPlaylist::set_state (const XMLNode& node, int version)
 {
 	in_set_state++;
 	freeze ();
 
-	Playlist::set_state (node);
+	Playlist::set_state (node, version);
 
 	thaw();
 	in_set_state--;
@@ -225,15 +359,13 @@ bool
 MidiPlaylist::destroy_region (boost::shared_ptr<Region> region)
 {
 	boost::shared_ptr<MidiRegion> r = boost::dynamic_pointer_cast<MidiRegion> (region);
-	bool changed = false;
 
-	if (r == 0) {
-		PBD::fatal << _("programming error: non-midi Region passed to remove_overlap in midi playlist")
-		<< endmsg;
-		/*NOTREACHED*/
+	if (!r) {
 		return false;
 	}
 
+	bool changed = false;
+
 	{
 		RegionLock rlock (this);
 		RegionList::iterator i;
@@ -287,7 +419,7 @@ MidiPlaylist::contained_automation()
 
 
 bool
-MidiPlaylist::region_changed (Change what_changed, boost::shared_ptr<Region> region)
+MidiPlaylist::region_changed (const PBD::PropertyChange& what_changed, boost::shared_ptr<Region> region)
 {
 	if (in_flush || in_set_state) {
 		return false;
@@ -295,19 +427,14 @@ MidiPlaylist::region_changed (Change what_changed, boost::shared_ptr<Region> reg
 
 	// Feeling rather uninterested today, but thanks for the heads up anyway!
 
-	Change our_interests = Change (/*MidiRegion::FadeInChanged|
-	                               MidiRegion::FadeOutChanged|
-	                               MidiRegion::FadeInActiveChanged|
-	                               MidiRegion::FadeOutActiveChanged|
-	                               MidiRegion::EnvelopeActiveChanged|
-	                               MidiRegion::ScaleAmplitudeChanged|
-	                               MidiRegion::EnvelopeChanged*/);
+	PBD::PropertyChange our_interests;
+
 	bool parent_wants_notify;
 
 	parent_wants_notify = Playlist::region_changed (what_changed, region);
 
-	if ((parent_wants_notify || (what_changed & our_interests))) {
-		notify_modified ();
+	if (parent_wants_notify || what_changed.contains (our_interests)) {
+		notify_contents_changed ();
 	}
 
 	return true;