#include "pbd/convert.h"
#include "pbd/compose.h"
+#include "ardour/boost_debug.h"
#include "ardour/debug.h"
#include "ardour/automation_control.h"
#include "ardour/automation_list.h"
, _has_state (false)
, _responding_to_control_auto_state_change (0)
{
+ //boost_debug_shared_ptr_mark_interesting (this, "pannable");
+
add_control (pan_azimuth_control);
add_control (pan_elevation_control);
add_control (pan_width_control);
}
XMLNode&
-Pannable::state (bool full)
+Pannable::state (bool /*full*/)
{
+ LocaleGuard lg;
XMLNode* node = new XMLNode (X_("Pannable"));
- XMLNode* control_node;
- char buf[32];
-
- control_node = new XMLNode (X_("azimuth"));
- snprintf (buf, sizeof(buf), "%.12g", pan_azimuth_control->get_value());
- control_node->add_property (X_("value"), buf);
- node->add_child_nocopy (*control_node);
-
- control_node = new XMLNode (X_("width"));
- snprintf (buf, sizeof(buf), "%.12g", pan_width_control->get_value());
- control_node->add_property (X_("value"), buf);
- node->add_child_nocopy (*control_node);
-
- control_node = new XMLNode (X_("elevation"));
- snprintf (buf, sizeof(buf), "%.12g", pan_elevation_control->get_value());
- control_node->add_property (X_("value"), buf);
- node->add_child_nocopy (*control_node);
-
- control_node = new XMLNode (X_("frontback"));
- snprintf (buf, sizeof(buf), "%.12g", pan_frontback_control->get_value());
- control_node->add_property (X_("value"), buf);
- node->add_child_nocopy (*control_node);
-
- control_node = new XMLNode (X_("lfe"));
- snprintf (buf, sizeof(buf), "%.12g", pan_lfe_control->get_value());
- control_node->add_property (X_("value"), buf);
- node->add_child_nocopy (*control_node);
+
+ node->add_child_nocopy (pan_azimuth_control->get_state());
+ node->add_child_nocopy (pan_width_control->get_state());
+ node->add_child_nocopy (pan_elevation_control->get_state());
+ node->add_child_nocopy (pan_frontback_control->get_state());
+ node->add_child_nocopy (pan_lfe_control->get_state());
node->add_child_nocopy (get_automation_xml_state ());
}
int
-Pannable::set_state (const XMLNode& root, int /*version - not used*/)
+Pannable::set_state (const XMLNode& root, int version)
{
if (root.name() != X_("Pannable")) {
warning << string_compose (_("Pannable given XML data for %1 - ignored"), root.name()) << endmsg;
return -1;
}
- XMLNodeList nlist;
+ const XMLNodeList& nlist (root.children());
XMLNodeConstIterator niter;
- const XMLProperty *prop;
-
- nlist = root.children();
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
- if ((*niter)->name() == X_("azimuth")) {
- prop = (*niter)->property (X_("value"));
- if (prop) {
- pan_azimuth_control->set_value (atof (prop->value()));
- }
- } else if ((*niter)->name() == X_("width")) {
- prop = (*niter)->property (X_("value"));
- if (prop) {
- pan_width_control->set_value (atof (prop->value()));
- }
- } else if ((*niter)->name() == X_("elevation")) {
- prop = (*niter)->property (X_("value"));
- if (prop) {
- pan_elevation_control->set_value (atof (prop->value()));
- }
- } else if ((*niter)->name() == X_("azimuth")) {
- prop = (*niter)->property (X_("value"));
- if (prop) {
- pan_frontback_control->set_value (atof (prop->value()));
+ if ((*niter)->name() == Controllable::xml_node_name) {
+ XMLProperty const * prop = (*niter)->property (X_("name"));
+
+ if (!prop) {
+ continue;
}
- } else if ((*niter)->name() == X_("lfe")) {
- prop = (*niter)->property (X_("value"));
- if (prop) {
- pan_lfe_control->set_value (atof (prop->value()));
+
+ if (prop->value() == pan_azimuth_control->name()) {
+ pan_azimuth_control->set_state (**niter, version);
+ } else if (prop->value() == pan_width_control->name()) {
+ pan_width_control->set_state (**niter, version);
+ } else if (prop->value() == pan_elevation_control->name()) {
+ pan_elevation_control->set_state (**niter, version);
+ } else if (prop->value() == pan_frontback_control->name()) {
+ pan_frontback_control->set_state (**niter, version);
+ } else if (prop->value() == pan_lfe_control->name()) {
+ pan_lfe_control->set_state (**niter, version);
}
+
} else if ((*niter)->name() == Automatable::xml_node_name) {
set_automation_xml_state (**niter, PanAzimuthAutomation);
+
+ } else {
+ XMLProperty const * prop;
+
+ /* old school (alpha1-6) XML info */
+
+ if ((*niter)->name() == X_("azimuth")) {
+ prop = (*niter)->property (X_("value"));
+ if (prop) {
+ pan_azimuth_control->set_value (atof (prop->value()), Controllable::NoGroup);
+ }
+ } else if ((*niter)->name() == X_("width")) {
+ prop = (*niter)->property (X_("value"));
+ if (prop) {
+ pan_width_control->set_value (atof (prop->value()), Controllable::NoGroup);
+ }
+ } else if ((*niter)->name() == X_("elevation")) {
+ prop = (*niter)->property (X_("value"));
+ if (prop) {
+ pan_elevation_control->set_value (atof (prop->value()), Controllable::NoGroup);
+ }
+ } else if ((*niter)->name() == X_("frontback")) {
+ prop = (*niter)->property (X_("value"));
+ if (prop) {
+ pan_frontback_control->set_value (atof (prop->value()), Controllable::NoGroup);
+ }
+ } else if ((*niter)->name() == X_("lfe")) {
+ prop = (*niter)->property (X_("value"));
+ if (prop) {
+ pan_lfe_control->set_value (atof (prop->value()), Controllable::NoGroup);
+ }
+ }
}
}
}
string
-Pannable::value_as_string (boost::shared_ptr<AutomationControl> ac) const
+Pannable::value_as_string (boost::shared_ptr<const AutomationControl> ac) const
{
boost::shared_ptr<Panner> p = panner ();