#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)
{
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();