diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-11 02:00:22 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-11 02:00:22 +0000 |
commit | 2983f8de97412b4887394747abed59fa11a11cff (patch) | |
tree | d8e43dfc53beca04f39ed9745de11491d9ba4844 /libs/pbd | |
parent | 29a8238e4d34f1f15aec0b55e98bee080cf8fec5 (diff) |
(MAY BREAK COMPILATION - unfinished work, being transferred between machines via svn) ... start to make MidiControllable bind to a URI, not an object
git-svn-id: svn://localhost/ardour2/branches/3.0@6346 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/pbd')
-rw-r--r-- | libs/pbd/controllable.cc | 82 | ||||
-rw-r--r-- | libs/pbd/pbd/controllable.h | 13 |
2 files changed, 80 insertions, 15 deletions
diff --git a/libs/pbd/controllable.cc b/libs/pbd/controllable.cc index a1cd650540..fbbb4d6f25 100644 --- a/libs/pbd/controllable.cc +++ b/libs/pbd/controllable.cc @@ -31,44 +31,82 @@ sigc::signal<void,Controllable*> Controllable::StopLearning; sigc::signal<void,Controllable*,int,int> Controllable::CreateBinding; sigc::signal<void,Controllable*> Controllable::DeleteBinding; -Glib::Mutex* Controllable::registry_lock = 0; +Glib::StaticRWLock Controllable::registry_lock = GLIBMM_STATIC_RW_LOCK_INIT; Controllable::Controllables Controllable::registry; +Controllable::ControllablesByURI Controllable::registry_by_uri; -Controllable::Controllable (std::string name) +Controllable::Controllable (const std::string& name, const std::string& uri) : _name (name) + , _uri (uri) , _touching (false) { - if (registry_lock == 0) { - registry_lock = new Glib::Mutex; - } - add (); } void Controllable::add () { - Glib::Mutex::Lock lm (*registry_lock); + Glib::RWLock::WriterLock lm (*registry_lock); registry.insert (this); + + if (!_uri.empty()) { + pair<string,Controllable*> newpair; + newpair.first = _uri; + newpair.second = this; + registry_by_uri.insert (newpair); + } + this->GoingAway.connect (mem_fun (this, &Controllable::remove)); } void Controllable::remove () { - Glib::Mutex::Lock lm (*registry_lock); + Glib::RWLock::WriterLock lm (*registry_lock); + for (Controllables::iterator i = registry.begin(); i != registry.end(); ++i) { if ((*i) == this) { registry.erase (i); break; } } + + if (_uri) { + ControllablesByURI::iterator i = registry_by_uri.find (_uri); + if (i != registry_by_uri.end()) { + registry_by_uri.erase (i); + } + } + + +} + +void +Controllable::set_uri (const std::string& new_uri) +{ + Glib::RWLock::WriterLock lm (*registry_lock); + + if (_uri) { + ControllablesByURI::iterator i = registry_by_uri.find (_uri); + if (i != registry_by_uri.end()) { + registry_by_uri.erase (i); + } + } + + _uri = new_uri; + + if (!_uri.empty()) { + pair<string,Controllable*> newpair; + newpair.first = _uri; + newpair.second = this; + registry_by_uri.insert (newpair); + } } Controllable* Controllable::by_id (const ID& id) { - Glib::Mutex::Lock lm (*registry_lock); + Glib::RWLock::ReaderLock lm (*registry_lock); for (Controllables::iterator i = registry.begin(); i != registry.end(); ++i) { if ((*i)->id() == id) { @@ -78,11 +116,22 @@ Controllable::by_id (const ID& id) return 0; } +Controllable* +Controllable::by_uri (const string& uri) +{ + Glib::RWLock::ReaderLock lm (*registry_lock); + ControllablesByURI::iterator i; + + if ((i = registry_by_ui.find (uri)) != registry_by_uri.end()) { + return i->second; + } + return 0; +} Controllable* Controllable::by_name (const std::string& str) { - Glib::Mutex::Lock lm (*registry_lock); + Glib::RWLock::ReaderLock lm (*registry_lock); for (Controllables::iterator i = registry.begin(); i != registry.end(); ++i) { if ((*i)->_name == str) { @@ -101,19 +150,28 @@ Controllable::get_state () node->add_property (X_("name"), _name); // not reloaded from XML state, just there to look at _id.print (buf, sizeof (buf)); node->add_property (X_("id"), buf); + + if (!_uri.empty()) { + node->add_property (X_("uri"), _uri); + } + return *node; } int Controllable::set_state (const XMLNode& node, int /*version*/) { - const XMLProperty* prop = node.property (X_("id")); + const XMLProperty* prop; - if (prop) { + if ((prop = node.property (X_("id"))) != 0) { _id = prop->value(); return 0; } else { error << _("Controllable state node has no ID property") << endmsg; return -1; } + + if ((prop = node.property (X_("uri"))) != 0) { + set_uri (prop->value()); + } } diff --git a/libs/pbd/pbd/controllable.h b/libs/pbd/pbd/controllable.h index 1ab649f8b9..76202d7bdb 100644 --- a/libs/pbd/pbd/controllable.h +++ b/libs/pbd/pbd/controllable.h @@ -2,7 +2,7 @@ Copyright (C) 2000-2007 Paul Davis This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by +v it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. @@ -34,9 +34,12 @@ namespace PBD { class Controllable : public PBD::StatefulDestructible { public: - Controllable (std::string name); + Controllable (std::string name, const std::string& uri); virtual ~Controllable() { Destroyed (this); } + void set_uri (const std::string&); + const std::string& uri() const { return _uri; } + virtual void set_value (float) = 0; virtual float get_value (void) const = 0; @@ -61,17 +64,21 @@ class Controllable : public PBD::StatefulDestructible { static Controllable* by_id (const PBD::ID&); static Controllable* by_name (const std::string&); + static Controllable* by_uri (const std::string&); private: std::string _name; + std::string _uri; bool _touching; void add (); void remove (); typedef std::set<PBD::Controllable*> Controllables; - static Glib::Mutex* registry_lock; + typedef std::map<std::string,PBD::Controllable*> ControllablesByURI; + static Glib::StaticRWLock registry_lock; static Controllables registry; + static ControllablesByURI registry_by_uri; }; /* a utility class for the occasions when you need but do not have |