diff options
| author | Carl Hetherington <carl@carlh.net> | 2012-04-26 08:44:06 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2012-04-26 08:44:06 +0000 |
| commit | 42d018ffa81b026ff4dc5d6a290bb118c6f244e7 (patch) | |
| tree | df263a1d835627ab70f7a46a1ca8102bf6be2f3e /libs/ardour/midi_playlist.cc | |
| parent | ec97b8e58d4d476cd340cddfabc388505fb1ef7e (diff) | |
Use Glib::Threads::RecMutex rather than Glib::RecMutex where
available; the latter is deprecated and there is some
evidence to suggest that it is broken on some glibmm
versions (around 2.31.0 ish) See, for example
https://github.com/lightspark/lightspark/issues/168
git-svn-id: svn://localhost/ardour2/branches/3.0@12094 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_playlist.cc')
| -rw-r--r-- | libs/ardour/midi_playlist.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc index 9b0eb374d5..7e3d70bfe0 100644 --- a/libs/ardour/midi_playlist.cc +++ b/libs/ardour/midi_playlist.cc @@ -107,7 +107,11 @@ MidiPlaylist::read (Evoral::EventSink<framepos_t>& dst, framepos_t start, framec its OK to block (for short intervals). */ +#ifdef HAVE_GLIB_THREADS_RECMUTEX + Glib::Threads::RecMutex::Lock rm (region_lock); +#else Glib::RecMutex::Lock rm (region_lock); +#endif DEBUG_TRACE (DEBUG::MidiPlaylistIO, string_compose ("++++++ %1 .. %2 +++++++ %3 trackers +++++++++++++++++\n", start, start + dur, _note_trackers.size())); @@ -294,7 +298,11 @@ MidiPlaylist::read (Evoral::EventSink<framepos_t>& dst, framepos_t start, framec void MidiPlaylist::clear_note_trackers () { +#ifdef HAVE_GLIB_THREADS_RECMUTEX + Glib::Threads::RecMutex::Lock rm (region_lock); +#else Glib::RecMutex::Lock rm (region_lock); +#endif for (NoteTrackers::iterator n = _note_trackers.begin(); n != _note_trackers.end(); ++n) { delete n->second; } @@ -399,7 +407,11 @@ MidiPlaylist::contained_automation() its OK to block (for short intervals). */ +#ifdef HAVE_GLIB_THREADS_RECMUTEX + Glib::Threads::RecMutex::Lock rm (region_lock); +#else Glib::RecMutex::Lock rm (region_lock); +#endif set<Evoral::Parameter> ret; |