Fix save/load of MIDI automation state. Fixes #3354.

[ardour.git] / libs / ardour / midi_stretch.cc

diff --git a/libs/ardour/midi_stretch.cc b/libs/ardour/midi_stretch.cc
index 585e0a07b27ad68b025db2d9c70668beab56533b..dedae6acb1c2e16fa81358c3f04824bcbd4b9199 100644 (file)
--- a/libs/ardour/midi_stretch.cc
+++ b/libs/ardour/midi_stretch.cc
@@ -90,19 +90,24 @@ MidiStretch::run (boost::shared_ptr<Region> r)
        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 (0, true);
                        i != old_model->end(); ++i) {
                const double new_time = i->time() * _request.time_fraction;
 
                // FIXME: double copy
                Evoral::Event<MidiModel::TimeType> ev(*i, true);
                ev.time() = new_time;
-               new_model->append(ev);
+               new_model->append(ev, Evoral::next_event_id());
        }
 
        new_model->end_write();
        new_model->set_edited(true);
 
+       new_src->copy_interpolation_from (src);
+
        const int ret = finish (region, nsrcs, new_name);
 
        results[0]->set_length((nframes_t) floor (r->length() * _request.time_fraction), NULL);