diff options
author | David Robillard <d@drobilla.net> | 2014-12-17 16:05:27 -0500 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2014-12-17 16:07:29 -0500 |
commit | a7067557107fc2f01586a88bb8b0a097914798ea (patch) | |
tree | c23f5f2e0386655c4d5e43ca714718e6bc1b76ac /libs/ardour/midi_stretch.cc | |
parent | 1fa9edd872bdbfe7651c822698235434ffe59540 (diff) |
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.
Diffstat (limited to 'libs/ardour/midi_stretch.cc')
-rw-r--r-- | libs/ardour/midi_stretch.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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<Region> r, Progress*) return -1; boost::shared_ptr<MidiSource> src = region->midi_source(0); - src->load_model(); + src->load_model(Glib::Threads::Mutex::Lock(src->mutex())); boost::shared_ptr<MidiModel> old_model = src->model(); @@ -88,7 +88,7 @@ MidiStretch::run (boost::shared_ptr<Region> 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<MidiModel> new_model = new_src->model(); new_model->start_write(); |