diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2012-07-25 17:48:55 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-07-25 17:48:55 +0000 |
commit | 3cd8138a419cb165f56070ace0b21a1e63ec5a43 (patch) | |
tree | 51efe9abff24a1367be227aebf8e2901433b0b88 /libs/ardour/ardour/location.h | |
parent | eb6e352dd0a307badf68ae4a216d15c03b4685de (diff) |
convert from Glib:: to Glib::Threads for all thread-related API
git-svn-id: svn://localhost/ardour2/branches/3.0@13084 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/location.h')
-rw-r--r-- | libs/ardour/ardour/location.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h index 069230438e..414f332b5e 100644 --- a/libs/ardour/ardour/location.h +++ b/libs/ardour/ardour/location.h @@ -27,7 +27,7 @@ #include <sys/types.h> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include "pbd/undo.h" #include "pbd/stateful.h" @@ -181,12 +181,12 @@ class Locations : public SessionHandleRef, public PBD::StatefulDestructible PBD::Signal1<void,const PBD::PropertyChange&> StateChanged; template<class T> void apply (T& obj, void (T::*method)(LocationList&)) { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); (obj.*method)(locations); } template<class T1, class T2> void apply (T1& obj, void (T1::*method)(LocationList&, T2& arg), T2& arg) { - Glib::Mutex::Lock lm (lock); + Glib::Threads::Mutex::Lock lm (lock); (obj.*method)(locations, arg); } @@ -194,7 +194,7 @@ class Locations : public SessionHandleRef, public PBD::StatefulDestructible LocationList locations; Location *current_location; - mutable Glib::Mutex lock; + mutable Glib::Threads::Mutex lock; int set_current_unlocked (Location *); void location_changed (Location*); |