X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fcontrollable.cc;h=b730a42980ffa08b05b8ec3390c22690113088c5;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=00638e6c06cc3312b159723913b3671523ef49aa;hpb=45d3ec1437cf661533bc7750c623865def4424df;p=ardour.git diff --git a/libs/pbd/controllable.cc b/libs/pbd/controllable.cc index 00638e6c06..b730a42980 100644 --- a/libs/pbd/controllable.cc +++ b/libs/pbd/controllable.cc @@ -1,42 +1,76 @@ -#include -#include -#include +/* + Copyright (C) 2000-2007 Paul Davis -#include "i18n.h" + 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include "pbd/controllable.h" +#include "pbd/enumwriter.h" +#include "pbd/xml++.h" +#include "pbd/error.h" +#include "pbd/locale_guard.h" + +#include "pbd/i18n.h" using namespace PBD; +using namespace std; -sigc::signal Controllable::Destroyed; -sigc::signal Controllable::StartLearning; -sigc::signal Controllable::StopLearning; +PBD::Signal1 Controllable::Destroyed; +PBD::Signal1 Controllable::StartLearning; +PBD::Signal1 Controllable::StopLearning; +PBD::Signal3 Controllable::CreateBinding; +PBD::Signal1 Controllable::DeleteBinding; -Glib::Mutex* Controllable::registry_lock = 0; +Glib::Threads::RWLock Controllable::registry_lock; Controllable::Controllables Controllable::registry; +PBD::ScopedConnectionList* registry_connections = 0; +const std::string Controllable::xml_node_name = X_("Controllable"); -Controllable::Controllable (std::string name) +Controllable::Controllable (const string& name, Flag f) : _name (name) + , _flags (f) + , _touching (false) { - if (registry_lock == 0) { - registry_lock = new Glib::Mutex; - } - - add (); + add (*this); } void -Controllable::add () +Controllable::add (Controllable& ctl) { - Glib::Mutex::Lock lm (*registry_lock); - registry.insert (this); - this->GoingAway.connect (mem_fun (this, &Controllable::remove)); + using namespace boost; + + Glib::Threads::RWLock::WriterLock lm (registry_lock); + registry.insert (&ctl); + + if (!registry_connections) { + registry_connections = new ScopedConnectionList; + } + + /* Controllable::remove() is static - no need to manage this connection */ + + ctl.DropReferences.connect_same_thread (*registry_connections, boost::bind (&Controllable::remove, &ctl)); } void -Controllable::remove () +Controllable::remove (Controllable* ctl) { - Glib::Mutex::Lock lm (*registry_lock); + Glib::Threads::RWLock::WriterLock lm (registry_lock); + for (Controllables::iterator i = registry.begin(); i != registry.end(); ++i) { - if ((*i) == this) { + if ((*i) == ctl) { registry.erase (i); break; } @@ -46,7 +80,7 @@ Controllable::remove () Controllable* Controllable::by_id (const ID& id) { - Glib::Mutex::Lock lm (*registry_lock); + Glib::Threads::RWLock::ReaderLock lm (registry_lock); for (Controllables::iterator i = registry.begin(); i != registry.end(); ++i) { if ((*i)->id() == id) { @@ -56,11 +90,10 @@ Controllable::by_id (const ID& id) return 0; } - Controllable* -Controllable::by_name (const std::string& str) +Controllable::by_name (const string& str) { - Glib::Mutex::Lock lm (*registry_lock); + Glib::Threads::RWLock::ReaderLock lm (registry_lock); for (Controllables::iterator i = registry.begin(); i != registry.end(); ++i) { if ((*i)->_name == str) { @@ -73,25 +106,62 @@ Controllable::by_name (const std::string& str) XMLNode& Controllable::get_state () { - XMLNode* node = new XMLNode (X_("controllable")); + XMLNode* node = new XMLNode (xml_node_name); + LocaleGuard lg; char buf[64]; - node->add_property (X_("name"), _name); // not reloaded from XML state, just there to look at - _id.print (buf, sizeof (buf)); + /* Waves' "Pressure3" has a parameter called "µ-iness" + * which causes a parser error : Input is not proper UTF-8, indicate encoding ! + * Bytes: 0xB5 0x2D 0x69 0x6E + * add_property (X_("name"), _name); + + id().print (buf, sizeof (buf)); node->add_property (X_("id"), buf); + node->add_property (X_("flags"), enum_2_string (_flags)); + snprintf (buf, sizeof (buf), "%2.12f", get_value()); + node->add_property (X_("value"), buf); + + if (_extra_xml) { + node->add_child_copy (*_extra_xml); + } + return *node; } + int -Controllable::set_state (const XMLNode& node) +Controllable::set_state (const XMLNode& node, int /*version*/) { - const XMLProperty* prop = node.property (X_("id")); - - if (prop) { - _id = prop->value(); - return 0; - } else { - error << _("Controllable state node has no ID property") << endmsg; - return -1; + LocaleGuard lg; + const XMLProperty* prop; + + Stateful::save_extra_xml (node); + + set_id (node); + + if ((prop = node.property (X_("flags"))) != 0) { + _flags = (Flag) string_2_enum (prop->value(), _flags); } + + if ((prop = node.property (X_("value"))) != 0) { + float val; + + if (sscanf (prop->value().c_str(), "%f", &val) == 1) { + set_value (val, NoGroup); + } + } + + return 0; +} + +void +Controllable::set_flags (Flag f) +{ + _flags = f; }