resolve gtk + VST threading issues

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

diff --git a/libs/ardour/midi_stretch.cc b/libs/ardour/midi_stretch.cc
index 83b845bbfcba1521e4684ba7422e28044a4a8e14..38cab08acec8bfdd1edb1c7a5537f5a170826c68 100644 (file)
--- a/libs/ardour/midi_stretch.cc
+++ b/libs/ardour/midi_stretch.cc
@@ -24,7 +24,6 @@
 #include "ardour/midi_region.h"
 #include "ardour/midi_source.h"
 #include "ardour/midi_stretch.h"
-#include "ardour/session.h"
 #include "ardour/types.h"
 
 #include "i18n.h"
@@ -50,8 +49,9 @@ MidiStretch::run (boost::shared_ptr<Region> r, Progress*)
        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.
@@ -75,18 +75,18 @@ MidiStretch::run (boost::shared_ptr<Region> r, Progress*)
        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();