restore ability to create TOC and CUE files during export. this is an option in a...

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

diff --git a/libs/ardour/midi_stretch.cc b/libs/ardour/midi_stretch.cc
index ee1ccc31ae283c8138415c9cd5fb1a3f34ff24dd..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, Progress* progress)
+MidiStretch::run (boost::shared_ptr<Region> r, Progress*)
 {
        SourceList nsrcs;
        char suffix[32];
@@ -99,18 +101,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((nframes_t) floor (r->length() * _request.time_fraction), NULL);
+       results[0]->set_length((framecnt_t) floor (r->length() * _request.time_fraction));
 
        return ret;
 }