/*
- Copyright (C) 2008 Paul Davis
+ Copyright (C) 2008 Paul Davis
Author: Dave Robillard
This program is free software; you can redistribute it and/or modify
*/
-#include <pbd/error.h>
+#include "pbd/error.h"
-#include <ardour/types.h>
-#include <ardour/midi_stretch.h>
-#include <ardour/session.h>
-#include <ardour/midi_region.h>
+#include "ardour/types.h"
+#include "ardour/midi_stretch.h"
+#include "ardour/session.h"
+#include "ardour/midi_region.h"
#include "i18n.h"
}
int
-MidiStretch::run (boost::shared_ptr<Region> r)
+MidiStretch::run (boost::shared_ptr<Region> r, Progress* progress)
{
SourceList nsrcs;
char suffix[32];
/* the name doesn't need to be super-precise, but allow for 2 fractional
digits just to disambiguate close but not identical stretches.
*/
-
+
snprintf (suffix, sizeof (suffix), "@%d", (int) floor (_request.time_fraction * 100.0f));
-
+
string new_name = region->name();
string::size_type at = new_name.find ('@');
}
new_name += suffix;
-
+
/* create new sources */
-
+
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();
boost::shared_ptr<MidiSource> new_src = boost::dynamic_pointer_cast<MidiSource>(nsrcs[0]);
assert(new_src);
+ 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 (MidiModel::const_iterator i = old_model->begin(); i != old_model->end(); ++i) {
+
+ /* 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 ev = Evoral::Event(*i, true);
+ 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);
return ret;