X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fpannable.cc;h=d77c8a0e7fb0511acb30e56717abec7afdd30f57;hb=80bd3e7279626dfe3a65c4abbab93b68f1be99a7;hp=4de47fc62b29ceb6a599b03d051ce7e4f41a7b39;hpb=98c7200f160c7586f2213681edaf076226528c51;p=ardour.git

diff --git a/libs/ardour/pannable.cc b/libs/ardour/pannable.cc
index 4de47fc62b..d77c8a0e7f 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"
@@ -29,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;
@@ -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,36 +185,16 @@ Pannable::get_state ()
 }
 
 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 ());
 
@@ -219,47 +202,70 @@ Pannable::state (bool full)
 }
 
 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);
+				}
+			}
 		}
 	}
 
@@ -269,7 +275,7 @@ Pannable::set_state (const XMLNode& root, int /*version - not used*/)
 }
 
 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 ();