X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fpannable.cc;h=754e8fc5d25f4f7dde879b5e0d3e9cc6895410c0;hb=91ab5e31751105d59386aab6a6e16ac5582904dc;hp=e020c19451c137abaf0d5870a598764465c05e02;hpb=106024330230fca331e2f611fec42ec1f4f43e5a;p=ardour.git

diff --git a/libs/ardour/pannable.cc b/libs/ardour/pannable.cc
index e020c19451..754e8fc5d2 100644
--- 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());
@@ -209,18 +213,59 @@ Pannable::set_state (const XMLNode& root, int version)
 	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) {
+			XMLProperty const * 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 {
+			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);
+				}
+			}
 		}
 	}
 
@@ -230,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 ();