X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_stretch.cc;h=d7facbb0f185dd2becfff035ad41be304465ef47;hb=9bf40bde3aed831791108bfccc4b1e10b071afdc;hp=585e0a07b27ad68b025db2d9c70668beab56533b;hpb=6d9c1201cc6c9adf866fb7769037c79decf2e5b0;p=ardour.git

diff --git a/libs/ardour/midi_stretch.cc b/libs/ardour/midi_stretch.cc
index 585e0a07b2..d7facbb0f1 100644
--- a/libs/ardour/midi_stretch.cc
+++ b/libs/ardour/midi_stretch.cc
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2008 Paul Davis
-    Author:  Dave Robillard
+    Author: David Robillard
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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)
 {
@@ -42,14 +43,15 @@ MidiStretch::~MidiStretch ()
 }
 
 int
-MidiStretch::run (boost::shared_ptr<Region> r)
+MidiStretch::run (boost::shared_ptr<Region> r, Progress*)
 {
 	SourceList nsrcs;
 	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,39 +75,47 @@ MidiStretch::run (boost::shared_ptr<Region> r)
 	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();
 
-	for (Evoral::Sequence<MidiModel::TimeType>::const_iterator i = old_model->begin();
+	/* 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 (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);
-		ev.time() = new_time;
-		new_model->append(ev);
+		ev.set_time(new_time);
+		new_model->append(ev, Evoral::next_event_id());
 	}
 
-	new_model->end_write();
-	new_model->set_edited(true);
+	new_model->end_write (Evoral::Sequence<Temporal::Beats>::DeleteStuckNotes);
+	new_model->set_edited (true);
 
-	const int ret = finish (region, nsrcs, new_name);
+	new_src->copy_interpolation_from (src);
 
-	results[0]->set_length((nframes_t) floor (r->length() * _request.time_fraction), NULL);
+	const int ret = finish (region, nsrcs, new_name);
+	/* non-musical */
+	results[0]->set_length((samplecnt_t) floor (r->length() * _request.time_fraction), 0);
 
 	return ret;
 }