force IFS=/ when calling path_expand, so that whitespace in paths doesn't cause worde...

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

diff --git a/libs/ardour/midi_stretch.cc b/libs/ardour/midi_stretch.cc
index 9cd1321a121e23fb36555b2c5d7ccb44e5262edd..7a4164427a24ba0f7e7a0a530acc9cb41c1ef04c 100644 (file)
--- 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,10 +20,12 @@
 
 #include "pbd/error.h"
 
-#include "ardour/types.h"
+#include "ardour/midi_model.h"
+#include "ardour/midi_region.h"
+#include "ardour/midi_source.h"
 #include "ardour/midi_stretch.h"
 #include "ardour/session.h"
-#include "ardour/midi_region.h"
+#include "ardour/types.h"
 
 #include "i18n.h"
 
@@ -42,7 +44,7 @@ MidiStretch::~MidiStretch ()
 }
 
 int
-MidiStretch::run (boost::shared_ptr<Region> r)
+MidiStretch::run (boost::shared_ptr<Region> r, Progress*)
 {
        SourceList nsrcs;
        char suffix[32];
@@ -84,26 +86,33 @@ MidiStretch::run (boost::shared_ptr<Region> r)
        boost::shared_ptr<MidiSource> new_src = boost::dynamic_pointer_cast<MidiSource>(nsrcs[0]);
        assert(new_src);
 
-       new_src->load_model(true, true);
+       Glib::Mutex::Lock sl (new_src->mutex ());
+
+       new_src->load_model(false, 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 (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);
+               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<Evoral::MusicalTime>::DeleteStuckNotes);
+       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);
+       results[0]->set_length((framecnt_t) floor (r->length() * _request.time_fraction));
 
        return ret;
 }