when stopping transport, revert _default_transport_speed to 1.0 if current speed...

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

diff --git a/libs/ardour/midi_stretch.cc b/libs/ardour/midi_stretch.cc
index af78e293dd4a2c25c8a619bba281308f45bd09ae..1794d5ff93553cb6e7cbbe16b5575ef202ffb724 100644 (file)
--- a/libs/ardour/midi_stretch.cc
+++ b/libs/ardour/midi_stretch.cc
@@ -20,10 +20,11 @@
 
 #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"
 
@@ -31,7 +32,7 @@ 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,7 +43,7 @@ MidiStretch::~MidiStretch ()
 }
 
 int
-MidiStretch::run (boost::shared_ptr<Region> r, Progress* progress)
+MidiStretch::run (boost::shared_ptr<Region> r, Progress*)
 {
        SourceList nsrcs;
        char suffix[32];
@@ -84,7 +85,7 @@ MidiStretch::run (boost::shared_ptr<Region> r, Progress* progress)
        boost::shared_ptr<MidiSource> new_src = boost::dynamic_pointer_cast<MidiSource>(nsrcs[0]);
        assert(new_src);
 
-       Glib::Mutex::Lock sl (new_src->mutex ());
+       Glib::Threads::Mutex::Lock sl (new_src->mutex ());
 
        new_src->load_model(false, true);
        boost::shared_ptr<MidiModel> new_model = new_src->model();
@@ -99,18 +100,18 @@ MidiStretch::run (boost::shared_ptr<Region> r, Progress* progress)
 
                // FIXME: double copy
                Evoral::Event<MidiModel::TimeType> ev(*i, true);
-               ev.time() = new_time;
+               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((framecnt_t) floor (r->length() * _request.time_fraction), NULL);
+       results[0]->set_length((framecnt_t) floor (r->length() * _request.time_fraction));
 
        return ret;
 }