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/pbd/controllable.cc | |
| 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/pbd/controllable.cc')
| -rw-r--r-- | libs/pbd/controllable.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/pbd/controllable.cc b/libs/pbd/controllable.cc index 82a8464c8b..42e015ac6f 100644 --- a/libs/pbd/controllable.cc +++ b/libs/pbd/controllable.cc @@ -34,7 +34,7 @@ PBD::Signal1<void,Controllable*> Controllable::StopLearning; PBD::Signal3<void,Controllable*,int,int> Controllable::CreateBinding; PBD::Signal1<void,Controllable*> Controllable::DeleteBinding; -Glib::StaticRWLock Controllable::registry_lock = GLIBMM_STATIC_RW_LOCK_INIT; +Glib::Threads::RWLock Controllable::registry_lock; Controllable::Controllables Controllable::registry; PBD::ScopedConnectionList* registry_connections = 0; const std::string Controllable::xml_node_name = X_("Controllable"); @@ -52,7 +52,7 @@ Controllable::add (Controllable& ctl) { using namespace boost; - Glib::RWLock::WriterLock lm (registry_lock); + Glib::Threads::RWLock::WriterLock lm (registry_lock); registry.insert (&ctl); if (!registry_connections) { @@ -67,7 +67,7 @@ Controllable::add (Controllable& ctl) void Controllable::remove (Controllable* ctl) { - Glib::RWLock::WriterLock lm (registry_lock); + Glib::Threads::RWLock::WriterLock lm (registry_lock); for (Controllables::iterator i = registry.begin(); i != registry.end(); ++i) { if ((*i) == ctl) { @@ -80,7 +80,7 @@ Controllable::remove (Controllable* ctl) Controllable* Controllable::by_id (const ID& id) { - Glib::RWLock::ReaderLock lm (registry_lock); + Glib::Threads::RWLock::ReaderLock lm (registry_lock); for (Controllables::iterator i = registry.begin(); i != registry.end(); ++i) { if ((*i)->id() == id) { @@ -93,7 +93,7 @@ Controllable::by_id (const ID& id) Controllable* Controllable::by_name (const string& str) { - Glib::RWLock::ReaderLock lm (registry_lock); + Glib::Threads::RWLock::ReaderLock lm (registry_lock); for (Controllables::iterator i = registry.begin(); i != registry.end(); ++i) { if ((*i)->_name == str) { |