#include "pbd/error.h"
#include "pbd/convert.h"
#include "pbd/compose.h"
+#include "pbd/boost_debug.h"
#include "ardour/debug.h"
#include "ardour/automation_control.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*/)
{
XMLNode* node = new XMLNode (X_("Pannable"));
XMLNodeConstIterator niter;
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
- if ((*niter)->name() == pan_azimuth_control->name()) {
- pan_azimuth_control->set_state (**niter, version);
- } else if ((*niter)->name() == pan_width_control->name()) {
- pan_width_control->set_state (**niter, version);
- } else if ((*niter)->name() == pan_elevation_control->name()) {
- pan_elevation_control->set_state (**niter, version);
- } else if ((*niter)->name() == pan_frontback_control->name()) {
- pan_frontback_control->set_state (**niter, version);
- } else if ((*niter)->name() == pan_lfe_control->name()) {
- pan_lfe_control->set_state (**niter, version);
+ if ((*niter)->name() == Controllable::xml_node_name) {
+ const XMLProperty* prop = (*niter)->property (X_("name"));
+
+ if (!prop) {
+ continue;
+ }
+
+ 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 {
+ const XMLProperty* 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()));
+ }
+ } 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_("frontback")) {
+ prop = (*niter)->property (X_("value"));
+ if (prop) {
+ pan_frontback_control->set_value (atof (prop->value()));
+ }
+ } else if ((*niter)->name() == X_("lfe")) {
+ prop = (*niter)->property (X_("value"));
+ if (prop) {
+ pan_lfe_control->set_value (atof (prop->value()));
+ }
+ }
}
}