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/ardour/playlist.h | |
| 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/ardour/playlist.h')
| -rw-r--r-- | libs/ardour/ardour/playlist.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index 3648ceda8f..d57df6999b 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -31,7 +31,9 @@ #include <sys/stat.h> #include <glib.h> - +#ifdef HAVE_GLIB_THREADS_RECMUTEX +#include <glibmm/threads.h> +#endif #include "pbd/undo.h" #include "pbd/stateful.h" @@ -253,7 +255,11 @@ public: int _sort_id; mutable gint block_notifications; mutable gint ignore_state_changes; +#ifdef HAVE_GLIB_THREADS_RECMUTEX + mutable Glib::Threads::RecMutex region_lock; +#else mutable Glib::RecMutex region_lock; +#endif std::set<boost::shared_ptr<Region> > pending_adds; std::set<boost::shared_ptr<Region> > pending_removes; RegionList pending_bounds; |