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/audio_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/audio_playlist.cc')
-rw-r--r-- | libs/ardour/audio_playlist.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc index 06f9b3bc65..ebebc62c33 100644 --- a/libs/ardour/audio_playlist.cc +++ b/libs/ardour/audio_playlist.cc @@ -186,7 +186,11 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, fr its OK to block (for short intervals). */ +#ifdef HAVE_GLIB_THREADS_RECMUTEX + Glib::Threads::RecMutex::Lock lm (region_lock); +#else Glib::RecMutex::Lock rm (region_lock); +#endif /* Find all the regions that are involved in the bit we are reading, and sort them by descending layer and ascending position. |