diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-16 00:16:34 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-16 00:16:34 +0000 |
| commit | 88f6395134c7b8e6fee9168580d43afb7b9bbb55 (patch) | |
| tree | ac4e661b985bf3bce8d05cb6fb43f3cc6bb28bf0 /libs/ardour/midi_playlist.cc | |
| parent | 674a7b3ac01eaa0d65c3db693135b483b2b15998 (diff) | |
switch to a RWLock for Playlist, to allow simultaneous reads (which can happen occasionally, eg. peak and butler threads)
git-svn-id: svn://localhost/ardour2/branches/3.0@12301 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_playlist.cc')
| -rw-r--r-- | libs/ardour/midi_playlist.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc index 81b14dd933..4bbedcecd8 100644 --- a/libs/ardour/midi_playlist.cc +++ b/libs/ardour/midi_playlist.cc @@ -107,7 +107,7 @@ MidiPlaylist::read (Evoral::EventSink<framepos_t>& dst, framepos_t start, framec its OK to block (for short intervals). */ - Playlist::RegionLock rl (this, false); + Playlist::RegionReadLock rl (this); DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("++++++ %1 .. %2 +++++++ %3 trackers +++++++++++++++++\n", start, start + dur, _note_trackers.size())); @@ -295,7 +295,7 @@ MidiPlaylist::read (Evoral::EventSink<framepos_t>& dst, framepos_t start, framec void MidiPlaylist::clear_note_trackers () { - Playlist::RegionLock rl (this, false); + Playlist::RegionWriteLock rl (this, false); for (NoteTrackers::iterator n = _note_trackers.begin(); n != _note_trackers.end(); ++n) { delete n->second; @@ -367,7 +367,7 @@ MidiPlaylist::destroy_region (boost::shared_ptr<Region> region) bool changed = false; { - RegionLock rlock (this); + RegionWriteLock rlock (this); RegionList::iterator i; RegionList::iterator tmp; @@ -401,7 +401,7 @@ MidiPlaylist::contained_automation() its OK to block (for short intervals). */ - Playlist::RegionLock rl (this, false); + Playlist::RegionReadLock rl (this); set<Evoral::Parameter> ret; for (RegionList::const_iterator r = regions.begin(); r != regions.end(); ++r) { |