add a lua timer callback signal

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

diff --git a/libs/ardour/pannable.cc b/libs/ardour/pannable.cc
index 247397d4158d41393c766465d4beb9e3fd8ddaf8..d77c8a0e7fb0511acb30e56717abec7afdd30f57 100644 (file)
--- a/libs/ardour/pannable.cc
+++ b/libs/ardour/pannable.cc
@@ -20,8 +20,8 @@
 #include "pbd/error.h"
 #include "pbd/convert.h"
 #include "pbd/compose.h"
-#include "pbd/boost_debug.h"
 
+#include "ardour/boost_debug.h"
 #include "ardour/debug.h"
 #include "ardour/automation_control.h"
 #include "ardour/automation_list.h"
@@ -30,7 +30,7 @@
 #include "ardour/pan_controllable.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;
@@ -187,6 +187,7 @@ Pannable::get_state ()
 XMLNode&
 Pannable::state (bool /*full*/)
 {
+       LocaleGuard lg;
        XMLNode* node = new XMLNode (X_("Pannable"));
 
        node->add_child_nocopy (pan_azimuth_control->get_state());
@@ -213,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;
@@ -235,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() == 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() == 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() == 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() == 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() == 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);
                                }
                        }
                }
@@ -274,7 +275,7 @@ Pannable::set_state (const XMLNode& root, int version)
 }
 
 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 ();