/*
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
#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"
using namespace ARDOUR;
using namespace PBD;
-MidiStretch::MidiStretch (Session& s, TimeFXRequest& req)
+MidiStretch::MidiStretch (Session& s, const TimeFXRequest& req)
: Filter (s)
, _request (req)
{
}
int
-MidiStretch::run (boost::shared_ptr<Region> r)
+MidiStretch::run (boost::shared_ptr<Region> r, Progress*)
{
SourceList nsrcs;
char suffix[32];
boost::shared_ptr<MidiRegion> region = boost::dynamic_pointer_cast<MidiRegion>(r);
- if (!region)
+ if (!region) {
return -1;
+ }
/* the name doesn't need to be super-precise, but allow for 2 fractional
digits just to disambiguate close but not identical stretches.
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<MidiModel> old_model = src->model();
boost::shared_ptr<MidiSource> new_src = boost::dynamic_pointer_cast<MidiSource>(nsrcs[0]);
- assert(new_src);
+ if (!new_src) {
+ error << _("MIDI stretch created non-MIDI source") << endmsg;
+ return -1;
+ }
- 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();
// 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;
}