X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fcontrollable.cc;h=a2e6265927037065db07855dbfe3021828be3d77;hb=c634daef6a9de8df7245d4fb6fbbcdf0ad7ac7ff;hp=369e2bd5451d13677b8b7720738f45636ec29520;hpb=f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe;p=ardour.git diff --git a/libs/pbd/controllable.cc b/libs/pbd/controllable.cc index 369e2bd545..a2e6265927 100644 --- a/libs/pbd/controllable.cc +++ b/libs/pbd/controllable.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + 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 @@ -18,27 +18,30 @@ */ #include "pbd/controllable.h" +#include "pbd/enumwriter.h" #include "pbd/xml++.h" #include "pbd/error.h" +#include "pbd/locale_guard.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace PBD; using namespace std; -boost::signals2::signal Controllable::Destroyed; -boost::signals2::signal Controllable::StartLearning; -boost::signals2::signal Controllable::StopLearning; -boost::signals2::signal Controllable::CreateBinding; -boost::signals2::signal Controllable::DeleteBinding; +PBD::Signal1 Controllable::Destroyed; +PBD::Signal1 Controllable::StartLearning; +PBD::Signal1 Controllable::StopLearning; +PBD::Signal3 Controllable::CreateBinding; +PBD::Signal1 Controllable::DeleteBinding; -Glib::StaticRWLock Controllable::registry_lock = GLIBMM_STATIC_RW_LOCK_INIT; +Glib::Threads::RWLock Controllable::registry_lock; Controllable::Controllables Controllable::registry; -Controllable::ControllablesByURI Controllable::registry_by_uri; +PBD::ScopedConnectionList* registry_connections = 0; +const std::string Controllable::xml_node_name = X_("Controllable"); -Controllable::Controllable (const string& name, const string& uri) +Controllable::Controllable (const string& name, Flag f) : _name (name) - , _uri (uri) + , _flags (f) , _touching (false) { add (*this); @@ -49,67 +52,35 @@ Controllable::add (Controllable& ctl) { using namespace boost; - Glib::RWLock::WriterLock lm (registry_lock); + Glib::Threads::RWLock::WriterLock lm (registry_lock); registry.insert (&ctl); - if (!ctl.uri().empty()) { - pair newpair; - newpair.first = ctl.uri(); - newpair.second = &ctl; - registry_by_uri.insert (newpair); + if (!registry_connections) { + registry_connections = new ScopedConnectionList; } /* Controllable::remove() is static - no need to manage this connection */ - ctl.GoingAway.connect (boost::bind (&Controllable::remove, ref (ctl))); + ctl.DropReferences.connect_same_thread (*registry_connections, boost::bind (&Controllable::remove, &ctl)); } void -Controllable::remove (Controllable& ctl) +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) { + if ((*i) == ctl) { registry.erase (i); break; } } - - if (!ctl.uri().empty()) { - ControllablesByURI::iterator i = registry_by_uri.find (ctl.uri()); - if (i != registry_by_uri.end()) { - registry_by_uri.erase (i); - } - } -} - -void -Controllable::set_uri (const string& new_uri) -{ - Glib::RWLock::WriterLock lm (registry_lock); - - if (!_uri.empty()) { - 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 newpair; - newpair.first = _uri; - newpair.second = this; - registry_by_uri.insert (newpair); - } } 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) { @@ -119,22 +90,10 @@ 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_uri.find (uri)) != registry_by_uri.end()) { - return i->second; - } - return 0; -} - 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) { @@ -147,34 +106,61 @@ Controllable::by_name (const 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_save_value()); + node->add_property (X_("value"), buf); - if (!_uri.empty()) { - node->add_property (X_("uri"), _uri); + if (_extra_xml) { + node->add_child_copy (*_extra_xml); } - + return *node; } int Controllable::set_state (const XMLNode& node, int /*version*/) { + LocaleGuard lg; const XMLProperty* 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; - } + Stateful::save_extra_xml (node); + + set_id (node); - if ((prop = node.property (X_("uri"))) != 0) { - set_uri (prop->value()); + if ((prop = node.property (X_("flags"))) != 0) { + _flags = (Flag) ((_flags & Controllable::RealTime) | 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; }