ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

fix newly introduced deadlock when cloning MIDI regions

Browse Source
This commit is contained in:
Paul Davis 2014-12-20 14:09:33 -05:00
parent abe97dbc8c
commit 282c563fce
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/ardour/midi_region.cc
View File

@ -151,7 +151,16 @@ MidiRegion::clone (boost::shared_ptr<MidiSource> newsrc) const
Evoral::MusicalTime const bend = bfc.from (_start + _length);
{
Source::Lock lm(newsrc->mutex());
Source::Lock lm (midi_source(0)->mutex());
/* ::write_to() will take the lock on newsrc.
XXX taking the lock on our own source here seems
partly sane and partly odd. We don't write the
data to the newsrc from our source, but from
the in memory copy. This whole thing (memory vs. disk, SMF
versus MidiModel) is so f'ed up that its no wonder
stuff is wierd sometimes.
*/
if (midi_source(0)->write_to (lm, newsrc, bbegin, bend)) {
return boost::shared_ptr<MidiRegion> ();
}