smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 11:46:25 +01:00
Code Issues Projects Releases Wiki Activity

MidiRegion::clone() needs to ensure that the model is loaded before calling MidiSource::write_to()

Browse source
This commit is contained in:
Paul Davis 2017-01-03 22:09:27 +00:00
parent 977cabf54a
commit 0f4d61ab30
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libs/ardour/midi_region.cc
View file

@ -178,10 +178,18 @@ MidiRegion::clone (boost::shared_ptr<MidiSource> newsrc) const
Evoral::Beats const bend = bfc.from (_start + _length); Evoral::Beats const bend = bfc.from (_start + _length);
{ {
boost::shared_ptr<MidiSource> ms = midi_source(0);
Source::Lock lm (ms->mutex());
if (!ms->model()) {
ms->load_model (lm);
}
/* Lock our source since we'll be reading from it. write_to() will /* Lock our source since we'll be reading from it. write_to() will
take a lock on newsrc. */ take a lock on newsrc.
Source::Lock lm (midi_source(0)->mutex()); */
if (midi_source(0)->write_to (lm, newsrc, bbegin, bend)) {
if (ms->write_to (lm, newsrc, bbegin, bend)) {
return boost::shared_ptr<MidiRegion> (); return boost::shared_ptr<MidiRegion> ();
} }
} }