X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_stretch.cc;h=70f44e19c1561c727ac465353565241f326302d1;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=fe0aca69edfd2cfe4f942eba42fcbf10dfa72bfa;hpb=18c2ee4a26f3991c7283744bd7e12cdae33a1297;p=ardour.git

diff --git a/libs/ardour/midi_stretch.cc b/libs/ardour/midi_stretch.cc
index fe0aca69ed..70f44e19c1 100644
--- a/libs/ardour/midi_stretch.cc
+++ b/libs/ardour/midi_stretch.cc
@@ -20,18 +20,19 @@
 
 #include "pbd/error.h"
 
-#include "ardour/types.h"
-#include "ardour/midi_stretch.h"
-#include "ardour/session.h"
+#include "ardour/midi_model.h"
 #include "ardour/midi_region.h"
+#include "ardour/midi_source.h"
+#include "ardour/midi_stretch.h"
+#include "ardour/types.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-MidiStretch::MidiStretch (Session& s, TimeFXRequest& req)
+MidiStretch::MidiStretch (Session& s, const TimeFXRequest& req)
 	: Filter (s)
 	, _request (req)
 {
@@ -48,8 +49,9 @@ MidiStretch::run (boost::shared_ptr<Region> r, Progress*)
 	char suffix[32];
 
 	boost::shared_ptr<MidiRegion> region = boost::dynamic_pointer_cast<MidiRegion>(r);
-	if (!region)
+	if (!region) {
 		return -1;
+	}
 
 	/* the name doesn't need to be super-precise, but allow for 2 fractional
 	   digits just to disambiguate close but not identical stretches.
@@ -73,29 +75,32 @@ MidiStretch::run (boost::shared_ptr<Region> r, Progress*)
 	if (make_new_sources (region, nsrcs, suffix))
 		return -1;
 
-	// FIXME: how to make a whole file region if it isn't?
-	//assert(region->whole_file());
-
 	boost::shared_ptr<MidiSource> src = region->midi_source(0);
-	src->load_model();
+	{
+		Source::Lock lock(src->mutex());
+		src->load_model(lock);
+	}
 
 	boost::shared_ptr<MidiModel> old_model = src->model();
 
 	boost::shared_ptr<MidiSource> new_src = boost::dynamic_pointer_cast<MidiSource>(nsrcs[0]);
-	assert(new_src);
+	if (!new_src) {
+		error << _("MIDI stretch created non-MIDI source") << endmsg;
+		return -1;
+	}
 
-	Glib::Mutex::Lock sl (new_src->mutex ());
+	Glib::Threads::Mutex::Lock sl (new_src->mutex ());
 
-	new_src->load_model(false, true);
+	new_src->load_model(sl, true);
 	boost::shared_ptr<MidiModel> new_model = new_src->model();
 	new_model->start_write();
 
 	/* Note: pass true into force_discrete for the begin() iterator so that the model doesn't
 	 * do interpolation of controller data when we stretch.
 	 */
-	for (Evoral::Sequence<MidiModel::TimeType>::const_iterator i = old_model->begin (0, true);
+	for (Evoral::Sequence<MidiModel::TimeType>::const_iterator i = old_model->begin (MidiModel::TimeType(), true);
 			i != old_model->end(); ++i) {
-		const double new_time = i->time() * _request.time_fraction;
+		const MidiModel::TimeType new_time = i->time() * (double)_request.time_fraction;
 
 		// FIXME: double copy
 		Evoral::Event<MidiModel::TimeType> ev(*i, true);
@@ -103,14 +108,14 @@ MidiStretch::run (boost::shared_ptr<Region> r, Progress*)
 		new_model->append(ev, Evoral::next_event_id());
 	}
 
-	new_model->end_write (Evoral::Sequence<Evoral::MusicalTime>::DeleteStuckNotes);
+	new_model->end_write (Evoral::Sequence<Evoral::Beats>::DeleteStuckNotes);
 	new_model->set_edited (true);
 
 	new_src->copy_interpolation_from (src);
 
 	const int ret = finish (region, nsrcs, new_name);
-
-	results[0]->set_length((framecnt_t) floor (r->length() * _request.time_fraction));
+	/* non-musical */
+	results[0]->set_length((framecnt_t) floor (r->length() * _request.time_fraction), 0);
 
 	return ret;
 }