From a7067557107fc2f01586a88bb8b0a097914798ea Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 17 Dec 2014 16:05:27 -0500 Subject: Fix various MIDI locking issues. Attempt to make mistakes much less likely in the future by statically requiring caller to pass scoped locks where necessary. --- libs/ardour/midi_stretch.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libs/ardour/midi_stretch.cc') diff --git a/libs/ardour/midi_stretch.cc b/libs/ardour/midi_stretch.cc index f5b3a47b41..0e75cdca1d 100644 --- a/libs/ardour/midi_stretch.cc +++ b/libs/ardour/midi_stretch.cc @@ -76,7 +76,7 @@ MidiStretch::run (boost::shared_ptr r, Progress*) return -1; boost::shared_ptr src = region->midi_source(0); - src->load_model(); + src->load_model(Glib::Threads::Mutex::Lock(src->mutex())); boost::shared_ptr old_model = src->model(); @@ -88,7 +88,7 @@ MidiStretch::run (boost::shared_ptr r, Progress*) Glib::Threads::Mutex::Lock sl (new_src->mutex ()); - new_src->load_model(false, true); + new_src->load_model(sl, true); boost::shared_ptr new_model = new_src->model(); new_model->start_write(); -- cgit v1.2.3