X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_playlist.cc;h=89b59147533c677a6c064532d0e284cdaea6640c;hb=2b9dc7b380bb4e40171067f42b4010970869a57d;hp=764a8cd0fc83168f1ad35b262d5c56318b084225;hpb=e0a2d498696eac65380eee8ff1ca0e29ec4c0783;p=ardour.git

diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc
index 764a8cd0fc..89b5914753 100644
--- a/libs/ardour/midi_playlist.cc
+++ b/libs/ardour/midi_playlist.cc
@@ -23,7 +23,6 @@
 #include <iostream>
 
 #include <stdlib.h>
-#include <sigc++/bind.h>
 
 #include "evoral/EventList.hpp"
 
@@ -40,7 +39,7 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
-using namespace sigc;
+using namespace PBD;
 using namespace std;
 
 MidiPlaylist::MidiPlaylist (Session& session, const XMLNode& node, bool hidden)
@@ -57,35 +56,27 @@ 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)
 {
 }
 
 MidiPlaylist::MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other, string name, bool hidden)
 	: Playlist (other, name, hidden)
+	, _note_mode(other->_note_mode)
 {
 }
 
 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) {
@@ -124,10 +115,19 @@ MidiPlaylist::read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t d
 				/* 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.
 				*/
 
-				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);
 			}
@@ -163,11 +163,11 @@ MidiPlaylist::read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t d
 				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", tracker->on()));
+				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", tracker->on()));
+			DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\tAFTER: tracker says there are %1 on notes\n", tracker->on()));
 
 			if (new_tracker) {
 				pair<Region*,MidiStateTracker*> newpair;
@@ -196,14 +196,12 @@ MidiPlaylist::read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t d
 			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)));
+			DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("\t%1\n", **x));
 		}
-
-		RegionSortByLayer layer_cmp;
-		sort(regs.begin(), regs.end(), layer_cmp);
+#endif
 
 		DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("for %1 .. %2 we have %3 to consider\n", start, start+dur-1, regs.size()));
 
@@ -233,12 +231,13 @@ MidiPlaylist::read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t d
 			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;
@@ -249,24 +248,25 @@ MidiPlaylist::read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t d
 			}
 		}
 
-		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;
 			}
+
 		}
 	}
 
@@ -274,6 +274,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)
 {
@@ -409,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;
@@ -417,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;