X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fautomatable.cc;h=20dc910f61d2af439e6bc8c2e693e8b6117d4dae;hb=f204206ff914200b132935d0fb1a8c84c2cf2284;hp=0c28eb95e01332655ec255c47c0c34a02a69b40f;hpb=be85889464470e66e33f6f09f3cf1a64ef3c5063;p=ardour.git

diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index 0c28eb95e0..20dc910f61 100644
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -35,7 +35,9 @@
 #include "ardour/amp.h"
 #include "ardour/event_type_map.h"
 #include "ardour/midi_track.h"
+#include "ardour/pannable.h"
 #include "ardour/panner.h"
+#include "ardour/pan_controllable.h"
 #include "ardour/plugin_insert.h"
 #include "ardour/session.h"
 
@@ -45,7 +47,8 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-nframes_t Automatable::_automation_interval = 0;
+framecnt_t Automatable::_automation_interval = 0;
+const string Automatable::xml_node_name = X_("Automation");
 
 Automatable::Automatable(Session& session)
 	: _a_session(session)
@@ -182,9 +185,6 @@ Automatable::describe_parameter (Evoral::Parameter param)
 
 	if (param == Evoral::Parameter(GainAutomation)) {
 		return _("Fader");
-	} else if (param.type() == PanAutomation) {
-		/* ID's are zero-based, present them as 1-based */
-		return (string_compose(_("Pan %1"), param.id() + 1));
 	} else if (param.type() == MidiCCAutomation) {
 		return string_compose("%1: %2 [%3]",
 				param.id() + 1, midi_name(param.id()), int(param.channel()) + 1);
@@ -224,7 +224,7 @@ Automatable::mark_automation_visible (Evoral::Parameter what, bool yn)
  * pass that type and it will be used for the untyped AutomationList found.
  */
 int
-Automatable::set_automation_state (const XMLNode& node, Evoral::Parameter legacy_param)
+Automatable::set_automation_xml_state (const XMLNode& node, Evoral::Parameter legacy_param)
 {
 	Glib::Mutex::Lock lm (control_lock());
 
@@ -255,24 +255,26 @@ Automatable::set_automation_state (const XMLNode& node, Evoral::Parameter legacy
 				continue;
                         }
 
-			boost::shared_ptr<AutomationList> al (new AutomationList(**niter, param));
 
+			
 			if (!id_prop) {
 				warning << "AutomationList node without automation-id property, "
 					<< "using default: " << EventTypeMap::instance().to_symbol(legacy_param) << endmsg;
 			}
 
-			boost::shared_ptr<Evoral::Control> existing = control(param);
+			boost::shared_ptr<AutomationControl> existing = automation_control (param);
+
 			if (existing) {
-				existing->set_list(al);
+                                existing->alist()->set_state (**niter, 3000);
 			} else {
-			    boost::shared_ptr<Evoral::Control> newcontrol = control_factory(param);
-				add_control(newcontrol);
+                                boost::shared_ptr<Evoral::Control> newcontrol = control_factory(param);
+				add_control (newcontrol);
+                                boost::shared_ptr<AutomationList> al (new AutomationList(**niter, param));
 				newcontrol->set_list(al);
 			}
 
 		} else {
-			error << "Expected AutomationList node, got '" << (*niter)->name() << endmsg;
+			error << "Expected AutomationList node, got '" << (*niter)->name() << "'" << endmsg;
 		}
 	}
 
@@ -282,10 +284,10 @@ Automatable::set_automation_state (const XMLNode& node, Evoral::Parameter legacy
 }
 
 XMLNode&
-Automatable::get_automation_state ()
+Automatable::get_automation_xml_state ()
 {
 	Glib::Mutex::Lock lm (control_lock());
-	XMLNode* node = new XMLNode (X_("Automation"));
+	XMLNode* node = new XMLNode (Automatable::xml_node_name);
 
 	if (controls().empty()) {
 		return *node;
@@ -387,7 +389,7 @@ Automatable::protect_automation ()
 }
 
 void
-Automatable::automation_snapshot (nframes_t now, bool force)
+Automatable::automation_snapshot (framepos_t now, bool force)
 {
 	if (force || _last_automation_snapshot > now || (now - _last_automation_snapshot) > _automation_interval) {
 
@@ -455,12 +457,12 @@ Automatable::control_factory(const Evoral::Parameter& param)
 		} else {
 			warning << "GainAutomation for non-Amp" << endl;
 		}
-	} else if (param.type() == PanAutomation) {
-		Panner* me = dynamic_cast<Panner*>(this);
-		if (me) {
-			control = new Panner::PanControllable(me->session(), X_("panner"), *me, param);
+	} else if (param.type() == PanAzimuthAutomation || param.type() == PanWidthAutomation || param.type() == PanElevationAutomation) {
+		Pannable* pannable = dynamic_cast<Pannable*>(this);
+		if (pannable) {
+			control = new PanControllable (_a_session, pannable->describe_parameter (param), pannable, param);
 		} else {
-			warning << "PanAutomation for non-Panner" << endl;
+			warning << "PanAutomation for non-Pannable" << endl;
 		}
 	}
 
@@ -490,3 +492,23 @@ Automatable::clear_controls ()
 	_control_connections.drop_connections ();
 	ControlSet::clear_controls ();
 }
+
+string
+Automatable::value_as_string (boost::shared_ptr<AutomationControl> ac) const
+{
+	std::stringstream s;
+
+        /* this is a the default fallback for this virtual method. Derived Automatables
+           are free to override this to display the values of their parameters/controls
+           in different ways.
+        */
+
+	// Hack to display CC as integer value, rather than double
+	if (ac->parameter().type() == MidiCCAutomation) {
+		s << lrint (ac->get_value());
+	} else {
+		s << std::fixed << std::setprecision(3) << ac->get_value();
+	}
+
+	return s.str ();
+}