From 42d018ffa81b026ff4dc5d6a290bb118c6f244e7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 26 Apr 2012 08:44:06 +0000 Subject: 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 --- libs/ardour/audio_playlist.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libs/ardour/audio_playlist.cc') 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. -- cgit v1.2.3