fix return type of SlavableAutomationControl::get_boolean_masters() to make it usefl

[ardour.git] / libs / ardour / pannable.cc

diff --git a/libs/ardour/pannable.cc b/libs/ardour/pannable.cc
index fb890a5e341d409c5fc4c847adece87113e926d4..ebf3115658c927278b976fecf2690651fd51c89f 100644 (file)
--- a/libs/ardour/pannable.cc
+++ b/libs/ardour/pannable.cc
@@ -21,6 +21,7 @@
 #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"
@@ -48,6 +49,8 @@ Pannable::Pannable (Session& s)
        , _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);
@@ -182,8 +185,9 @@ Pannable::get_state ()
 }
 
 XMLNode&
-Pannable::state (bool full)
+Pannable::state (bool /*full*/)
 {
+       LocaleGuard lg;
        XMLNode* node = new XMLNode (X_("Pannable"));
 
        node->add_child_nocopy (pan_azimuth_control->get_state());
@@ -210,7 +214,7 @@ Pannable::set_state (const XMLNode& root, int version)
 
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
                if ((*niter)->name() == Controllable::xml_node_name) {
-                       const XMLProperty* prop = (*niter)->property (X_("name"));
+                       XMLProperty const * prop = (*niter)->property (X_("name"));
 
                        if (!prop) {
                                continue;
@@ -232,34 +236,34 @@ Pannable::set_state (const XMLNode& root, int version)
                        set_automation_xml_state (**niter, PanAzimuthAutomation);
 
                } else {
-                       const XMLProperty* prop;
+                       XMLProperty const * prop;
 
                        /* old school (alpha1-6) XML info */
 
-                       if ((*niter)->name() == pan_azimuth_control->name()) {
+                       if ((*niter)->name() == X_("azimuth")) {
                                prop = (*niter)->property (X_("value"));
                                if (prop) {
-                                       pan_azimuth_control->set_value (atof (prop->value()));
+                                       pan_azimuth_control->set_value (atof (prop->value()), Controllable::NoGroup);
                                }
-                       } else if ((*niter)->name() == pan_width_control->name()) {
+                       } else if ((*niter)->name() == X_("width")) {
                                prop = (*niter)->property (X_("value"));
                                if (prop) {
-                                       pan_width_control->set_value (atof (prop->value()));
+                                       pan_width_control->set_value (atof (prop->value()), Controllable::NoGroup);
                                }
-                       } else if ((*niter)->name() == pan_elevation_control->name()) {
+                       } else if ((*niter)->name() == X_("elevation")) {
                                prop = (*niter)->property (X_("value"));
                                if (prop) {
-                                       pan_elevation_control->set_value (atof (prop->value()));
+                                       pan_elevation_control->set_value (atof (prop->value()), Controllable::NoGroup);
                                }
-                       } else if ((*niter)->name() == pan_frontback_control->name()) {
+                       } else if ((*niter)->name() == X_("frontback")) {
                                prop = (*niter)->property (X_("value"));
                                if (prop) {
-                                       pan_frontback_control->set_value (atof (prop->value()));
+                                       pan_frontback_control->set_value (atof (prop->value()), Controllable::NoGroup);
                                }
-                       } else if ((*niter)->name() == pan_lfe_control->name()) {
+                       } else if ((*niter)->name() == X_("lfe")) {
                                prop = (*niter)->property (X_("value"));
                                if (prop) {
-                                       pan_lfe_control->set_value (atof (prop->value()));
+                                       pan_lfe_control->set_value (atof (prop->value()), Controllable::NoGroup);
                                }
                        }
                }